mirror of
https://github.com/Aust1n46/VentureChat.git
synced 2025-05-23 10:39:05 +00:00
Hotfix for error when player kicked.
This commit is contained in:
parent
b83913d811
commit
87b49cec2b
@ -1,4 +1,4 @@
|
|||||||
name: VentureChat
|
name: VentureChat
|
||||||
main: mineverse.Aust1n46.chat.bungee.MineverseChatBungee
|
main: mineverse.Aust1n46.chat.bungee.MineverseChatBungee
|
||||||
version: 2.22.1
|
version: 2.22.2
|
||||||
author: Aust1n46
|
author: Aust1n46
|
@ -11,7 +11,6 @@ import org.bukkit.event.EventHandler;
|
|||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
import org.bukkit.event.player.PlayerJoinEvent;
|
import org.bukkit.event.player.PlayerJoinEvent;
|
||||||
import org.bukkit.event.player.PlayerKickEvent;
|
|
||||||
import org.bukkit.event.player.PlayerQuitEvent;
|
import org.bukkit.event.player.PlayerQuitEvent;
|
||||||
|
|
||||||
import mineverse.Aust1n46.chat.MineverseChat;
|
import mineverse.Aust1n46.chat.MineverseChat;
|
||||||
@ -28,17 +27,6 @@ public class LoginListener implements Listener {
|
|||||||
private MineverseChat plugin = MineverseChat.getInstance();
|
private MineverseChat plugin = MineverseChat.getInstance();
|
||||||
private boolean firstPlayerHasJoined = false;
|
private boolean firstPlayerHasJoined = false;
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.LOW)
|
|
||||||
public void onPlayerKick(PlayerKickEvent plog) {
|
|
||||||
if(!plugin.getConfig().getConfigurationSection("logout").getString("message", "Default").equalsIgnoreCase("Default")) {
|
|
||||||
plog.setLeaveMessage(Format.FormatStringAll(plugin.getConfig().getConfigurationSection("logout").getString("message", "Default").replace("{player}", plog.getPlayer().getName())));
|
|
||||||
}
|
|
||||||
if(!plugin.getConfig().getConfigurationSection("logout").getBoolean("enabled", true)) {
|
|
||||||
plog.setLeaveMessage("");
|
|
||||||
}
|
|
||||||
playerLeaving(plog.getPlayer());
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.LOW)
|
@EventHandler(priority = EventPriority.LOW)
|
||||||
public void onPlayerQuit(PlayerQuitEvent plog) {
|
public void onPlayerQuit(PlayerQuitEvent plog) {
|
||||||
if(!plugin.getConfig().getConfigurationSection("logout").getString("message", "Default").equalsIgnoreCase("Default")) {
|
if(!plugin.getConfig().getConfigurationSection("logout").getString("message", "Default").equalsIgnoreCase("Default")) {
|
||||||
@ -50,6 +38,14 @@ public class LoginListener implements Listener {
|
|||||||
playerLeaving(plog.getPlayer());
|
playerLeaving(plog.getPlayer());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void playerLeaving(Player player) {
|
||||||
|
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer(player);
|
||||||
|
PlayerData.savePlayerData(mcp);
|
||||||
|
mcp.clearMessages();
|
||||||
|
mcp.setOnline(false);
|
||||||
|
MineverseChatAPI.removeMineverseChatOnlinePlayerToMap(mcp);
|
||||||
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.LOW)
|
@EventHandler(priority = EventPriority.LOW)
|
||||||
public void onPlayerJoin(PlayerJoinEvent event) throws Exception {
|
public void onPlayerJoin(PlayerJoinEvent event) throws Exception {
|
||||||
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer(event.getPlayer());
|
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer(event.getPlayer());
|
||||||
@ -121,12 +117,4 @@ public class LoginListener implements Listener {
|
|||||||
event.setJoinMessage("");
|
event.setJoinMessage("");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void playerLeaving(Player player) {
|
|
||||||
MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer(player);
|
|
||||||
PlayerData.savePlayerData(mcp);
|
|
||||||
mcp.clearMessages();
|
|
||||||
mcp.setOnline(false);
|
|
||||||
MineverseChatAPI.removeMineverseChatOnlinePlayerToMap(mcp);
|
|
||||||
}
|
|
||||||
}
|
}
|
@ -1,5 +1,5 @@
|
|||||||
name: VentureChat
|
name: VentureChat
|
||||||
version: 2.22.1
|
version: 2.22.2
|
||||||
api-version: 1.13
|
api-version: 1.13
|
||||||
main: mineverse.Aust1n46.chat.MineverseChat
|
main: mineverse.Aust1n46.chat.MineverseChat
|
||||||
depend: [Vault, ProtocolLib, PlaceholderAPI]
|
depend: [Vault, ProtocolLib, PlaceholderAPI]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user