From 868b84aac8338cc9a7070bb0079df42b25a9101b Mon Sep 17 00:00:00 2001 From: Aust1n46 Date: Fri, 12 Feb 2021 15:11:37 -0600 Subject: [PATCH] Switched to more efficient online player lookups. --- .../Aust1n46/chat/VentureChatPlaceholders.java | 2 +- .../Aust1n46/chat/command/chat/BungeeToggle.java | 2 +- .../Aust1n46/chat/command/chat/Channel.java | 4 ++-- .../Aust1n46/chat/command/chat/Chatinfo.java | 2 +- src/mineverse/Aust1n46/chat/command/chat/Chwho.java | 2 +- .../Aust1n46/chat/command/chat/Commandblock.java | 2 +- .../Aust1n46/chat/command/chat/Commandspy.java | 2 +- .../Aust1n46/chat/command/chat/Filter.java | 2 +- src/mineverse/Aust1n46/chat/command/chat/Force.java | 4 ++-- src/mineverse/Aust1n46/chat/command/chat/Leave.java | 2 +- .../Aust1n46/chat/command/chat/Listen.java | 2 +- src/mineverse/Aust1n46/chat/command/chat/Me.java | 2 +- src/mineverse/Aust1n46/chat/command/chat/Nick.java | 2 +- src/mineverse/Aust1n46/chat/command/chat/Party.java | 2 +- .../Aust1n46/chat/command/chat/RangedSpy.java | 2 +- .../Aust1n46/chat/command/chat/VentureChatGui.java | 2 +- .../chat/command/message/IgnoreCommandExecutor.java | 6 +++--- .../command/message/MessageCommandExecutor.java | 13 +++---------- .../chat/command/message/MessageToggle.java | 2 +- .../chat/command/message/Notifications.java | 2 +- .../Aust1n46/chat/command/message/Reply.java | 13 ++++++------- .../Aust1n46/chat/command/message/Spy.java | 2 +- .../Aust1n46/chat/listeners/CommandListener.java | 2 +- .../Aust1n46/chat/listeners/LoginListener.java | 2 +- .../Aust1n46/chat/listeners/SignListener.java | 2 +- 25 files changed, 36 insertions(+), 44 deletions(-) diff --git a/src/mineverse/Aust1n46/chat/VentureChatPlaceholders.java b/src/mineverse/Aust1n46/chat/VentureChatPlaceholders.java index 319f273..98db259 100644 --- a/src/mineverse/Aust1n46/chat/VentureChatPlaceholders.java +++ b/src/mineverse/Aust1n46/chat/VentureChatPlaceholders.java @@ -13,7 +13,7 @@ public class VentureChatPlaceholders extends PlaceholderExpansion { if(p == null) { return null; } - MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer(p); + MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer(p); if(mcp == null) { return ""; } diff --git a/src/mineverse/Aust1n46/chat/command/chat/BungeeToggle.java b/src/mineverse/Aust1n46/chat/command/chat/BungeeToggle.java index 8eafc04..e0e1dbf 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/BungeeToggle.java +++ b/src/mineverse/Aust1n46/chat/command/chat/BungeeToggle.java @@ -23,7 +23,7 @@ public class BungeeToggle extends MineverseCommand { plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } - MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); + MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); if(mcp.getPlayer().hasPermission("venturechat.bungeetoggle")) { if(!mcp.getBungeeToggle()) { mcp.setBungeeToggle(true); diff --git a/src/mineverse/Aust1n46/chat/command/chat/Channel.java b/src/mineverse/Aust1n46/chat/command/chat/Channel.java index 76a7b33..2258867 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Channel.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Channel.java @@ -29,7 +29,7 @@ public class Channel extends MineverseCommand implements Listener { plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } - MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); + MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); if(args.length > 0) { if(!ChatChannel.isChannel(args[0])) { mcp.getPlayer().sendMessage(LocalizedMessage.INVALID_CHANNEL.toString() @@ -53,7 +53,7 @@ public class Channel extends MineverseCommand implements Listener { if(event.isCancelled()) return; ChatChannel channel = event.getChannel(); - MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer(event.getPlayer()); + MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer(event.getPlayer()); if(channel.hasPermission()) { if(!mcp.getPlayer().hasPermission(channel.getPermission())) { mcp.removeListening(channel.getName()); diff --git a/src/mineverse/Aust1n46/chat/command/chat/Chatinfo.java b/src/mineverse/Aust1n46/chat/command/chat/Chatinfo.java index 8cb036f..227929b 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Chatinfo.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Chatinfo.java @@ -26,7 +26,7 @@ public class Chatinfo extends MineverseCommand { plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player; use /ci [name]"); return; } - MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); + MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); String listen = ""; String mute = ""; String blockedcommands = ""; diff --git a/src/mineverse/Aust1n46/chat/command/chat/Chwho.java b/src/mineverse/Aust1n46/chat/command/chat/Chwho.java index 5353218..985e23b 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Chwho.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Chwho.java @@ -36,7 +36,7 @@ public class Chwho extends MineverseCommand { if(channel != null) { if(channel.hasPermission()) { if(!sender.hasPermission(channel.getPermission())) { - MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer(((Player) sender)); + MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer(((Player) sender)); mcp.removeListening(channel.getName()); mcp.getPlayer().sendMessage(LocalizedMessage.CHANNEL_NO_PERMISSION_VIEW.toString()); return; diff --git a/src/mineverse/Aust1n46/chat/command/chat/Commandblock.java b/src/mineverse/Aust1n46/chat/command/chat/Commandblock.java index a5768cc..9103e4c 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Commandblock.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Commandblock.java @@ -22,7 +22,7 @@ public class Commandblock extends MineverseCommand { public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.commandblock")) { if(args.length > 1) { - MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); + MineverseChatPlayer player = MineverseChatAPI.getOnlineMineverseChatPlayer(args[0]); if(player == null) { sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() .replace("{args}", args[0])); diff --git a/src/mineverse/Aust1n46/chat/command/chat/Commandspy.java b/src/mineverse/Aust1n46/chat/command/chat/Commandspy.java index 9654788..c87fd03 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Commandspy.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Commandspy.java @@ -23,7 +23,7 @@ public class Commandspy extends MineverseCommand { plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } - MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); + MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); if(mcp.getPlayer().hasPermission("venturechat.commandspy")) { if(!mcp.hasCommandSpy()) { mcp.setCommandSpy(true); diff --git a/src/mineverse/Aust1n46/chat/command/chat/Filter.java b/src/mineverse/Aust1n46/chat/command/chat/Filter.java index 976713d..dcc1bee 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Filter.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Filter.java @@ -23,7 +23,7 @@ public class Filter extends MineverseCommand { plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } - MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); + MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); if(mcp.getPlayer().hasPermission("venturechat.ignorefilter")) { if(!mcp.hasFilter()) { mcp.setFilter(true); diff --git a/src/mineverse/Aust1n46/chat/command/chat/Force.java b/src/mineverse/Aust1n46/chat/command/chat/Force.java index 5f78ac5..a63a4b3 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Force.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Force.java @@ -22,8 +22,8 @@ public class Force extends MineverseCommand { .replace("{args}", "[player] [message]")); return; } - MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); - if(player == null || !player.isOnline()) { + MineverseChatPlayer player = MineverseChatAPI.getOnlineMineverseChatPlayer(args[0]); + if(player == null) { sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() .replace("{args}", args[0])); return; diff --git a/src/mineverse/Aust1n46/chat/command/chat/Leave.java b/src/mineverse/Aust1n46/chat/command/chat/Leave.java index b183781..219f199 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Leave.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Leave.java @@ -24,7 +24,7 @@ public class Leave extends MineverseCommand { plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } - MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); + MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); if(args.length > 0) { ChatChannel channel = ChatChannel.getChannel(args[0]); if(channel == null) { diff --git a/src/mineverse/Aust1n46/chat/command/chat/Listen.java b/src/mineverse/Aust1n46/chat/command/chat/Listen.java index cdb82bd..29ba350 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Listen.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Listen.java @@ -23,7 +23,7 @@ public class Listen extends MineverseCommand { plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } - MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); + MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); if(args.length > 0) { ChatChannel channel = ChatChannel.getChannel(args[0]); if(channel == null) { diff --git a/src/mineverse/Aust1n46/chat/command/chat/Me.java b/src/mineverse/Aust1n46/chat/command/chat/Me.java index 9c02875..976329a 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Me.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Me.java @@ -24,7 +24,7 @@ public class Me extends MineverseCommand { for(int x = 0; x < args.length; x++) if(args[x].length() > 0) msg += " " + args[x]; - if(sender instanceof Player && MineverseChatAPI.getMineverseChatPlayer((Player) sender).hasFilter()) { + if(sender instanceof Player && MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender).hasFilter()) { msg = Format.FilterChat(msg); } if(sender.hasPermission("venturechat.color.legacy")) { diff --git a/src/mineverse/Aust1n46/chat/command/chat/Nick.java b/src/mineverse/Aust1n46/chat/command/chat/Nick.java index c491801..0aedc6c 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Nick.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Nick.java @@ -28,7 +28,7 @@ public class Nick extends MineverseCommand { plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player."); return; } - MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); + MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); if(args[0].equalsIgnoreCase("Off")) { mcp.getPlayer().setDisplayName(mcp.getName()); mcp.setNickname(mcp.getName()); diff --git a/src/mineverse/Aust1n46/chat/command/chat/Party.java b/src/mineverse/Aust1n46/chat/command/chat/Party.java index faad4be..5097249 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/Party.java +++ b/src/mineverse/Aust1n46/chat/command/chat/Party.java @@ -23,7 +23,7 @@ public class Party extends MineverseCommand { plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player."); return; } - MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); + MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); if(!mcp.getPlayer().hasPermission("venturechat.party")) { mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command!"); return; diff --git a/src/mineverse/Aust1n46/chat/command/chat/RangedSpy.java b/src/mineverse/Aust1n46/chat/command/chat/RangedSpy.java index e36fea5..e8864c6 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/RangedSpy.java +++ b/src/mineverse/Aust1n46/chat/command/chat/RangedSpy.java @@ -23,7 +23,7 @@ public class RangedSpy extends MineverseCommand { plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } - MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); + MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); if(mcp.getPlayer().hasPermission("venturechat.rangedspy")) { if(!mcp.getRangedSpy()) { mcp.setRangedSpy(true); diff --git a/src/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java b/src/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java index 2452886..e22b177 100644 --- a/src/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java +++ b/src/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java @@ -42,7 +42,7 @@ public class VentureChatGui extends MineverseCommand { .replace("{args}", "[player] [channel] [hashcode]")); return; } - MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); + MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); if(mcp.getPlayer().hasPermission("venturechat.gui")) { MineverseChatPlayer target = MineverseChatAPI.getMineverseChatPlayer(args[0]); if(target == null && !args[0].equals("Discord")) { diff --git a/src/mineverse/Aust1n46/chat/command/message/IgnoreCommandExecutor.java b/src/mineverse/Aust1n46/chat/command/message/IgnoreCommandExecutor.java index 16a2e96..c28864b 100644 --- a/src/mineverse/Aust1n46/chat/command/message/IgnoreCommandExecutor.java +++ b/src/mineverse/Aust1n46/chat/command/message/IgnoreCommandExecutor.java @@ -25,7 +25,7 @@ public class IgnoreCommandExecutor implements TabExecutor { plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return true; } - MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); + MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); if(args.length == 0) { mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS_IGNORE.toString()); return true; @@ -67,8 +67,8 @@ public class IgnoreCommandExecutor implements TabExecutor { return true; } - MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); - if(player == null || !player.isOnline()) { + MineverseChatPlayer player = MineverseChatAPI.getOnlineMineverseChatPlayer(args[0]); + if(player == null) { mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() .replace("{args}", args[0])); return true; diff --git a/src/mineverse/Aust1n46/chat/command/message/MessageCommandExecutor.java b/src/mineverse/Aust1n46/chat/command/message/MessageCommandExecutor.java index a121278..0040000 100644 --- a/src/mineverse/Aust1n46/chat/command/message/MessageCommandExecutor.java +++ b/src/mineverse/Aust1n46/chat/command/message/MessageCommandExecutor.java @@ -4,7 +4,6 @@ import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; import java.util.List; -import org.bukkit.ChatColor; import org.bukkit.Sound; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -29,7 +28,7 @@ public class MessageCommandExecutor implements TabExecutor { return true; } - MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); + MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); if(args.length == 0) { mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() .replace("{command}", "/" + command.getName()) @@ -42,14 +41,8 @@ public class MessageCommandExecutor implements TabExecutor { return true; } - MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); - for(MineverseChatPlayer p : MineverseChat.onlinePlayers) { - if(ChatColor.stripColor(p.getNickname()).equals(args[0])) { - player = p; - break; - } - } - if(player == null || !player.isOnline()) { + MineverseChatPlayer player = MineverseChatAPI.getOnlineMineverseChatPlayer(args[0]); + if(player == null) { mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() .replace("{args}", args[0])); return true; diff --git a/src/mineverse/Aust1n46/chat/command/message/MessageToggle.java b/src/mineverse/Aust1n46/chat/command/message/MessageToggle.java index 62a5580..790e12a 100644 --- a/src/mineverse/Aust1n46/chat/command/message/MessageToggle.java +++ b/src/mineverse/Aust1n46/chat/command/message/MessageToggle.java @@ -23,7 +23,7 @@ public class MessageToggle extends MineverseCommand { plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } - MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); + MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); if(mcp.getPlayer().hasPermission("venturechat.messagetoggle")) { if(!mcp.getMessageToggle()) { mcp.setMessageToggle(true); diff --git a/src/mineverse/Aust1n46/chat/command/message/Notifications.java b/src/mineverse/Aust1n46/chat/command/message/Notifications.java index ef35f92..b3c6506 100644 --- a/src/mineverse/Aust1n46/chat/command/message/Notifications.java +++ b/src/mineverse/Aust1n46/chat/command/message/Notifications.java @@ -24,7 +24,7 @@ public class Notifications extends MineverseCommand { return; } - MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); + MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); if(!mcp.hasNotifications()) { mcp.setNotifications(true); mcp.getPlayer().sendMessage(LocalizedMessage.NOTIFICATIONS_ON.toString()); diff --git a/src/mineverse/Aust1n46/chat/command/message/Reply.java b/src/mineverse/Aust1n46/chat/command/message/Reply.java index 6d6c080..caa6f9c 100644 --- a/src/mineverse/Aust1n46/chat/command/message/Reply.java +++ b/src/mineverse/Aust1n46/chat/command/message/Reply.java @@ -29,17 +29,16 @@ public class Reply extends MineverseCommand { plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } - MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); + MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); if(args.length > 0) { if(mcp.hasReplyPlayer()) { - MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(mcp.getReplyPlayer()); - if(plugin.getConfig().getBoolean("bungeecordmessaging", true)) { - sendBungeeCordReply(mcp, player, args); + sendBungeeCordReply(mcp, args); return; } - if(player == null || !player.isOnline()) { + MineverseChatPlayer player = MineverseChatAPI.getOnlineMineverseChatPlayer(mcp.getReplyPlayer()); + if(player == null) { mcp.getPlayer().sendMessage(LocalizedMessage.NO_PLAYER_TO_REPLY_TO.toString()); return; } @@ -117,7 +116,7 @@ public class Reply extends MineverseCommand { .replace("{args}", "[message]")); } - private void sendBungeeCordReply(MineverseChatPlayer mcp, MineverseChatPlayer player, String[] args) { + private void sendBungeeCordReply(MineverseChatPlayer mcp, String[] args) { ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream(); DataOutputStream out = new DataOutputStream(byteOutStream); String msg = ""; @@ -146,7 +145,7 @@ public class Reply extends MineverseCommand { try { out.writeUTF("Message"); out.writeUTF("Send"); - out.writeUTF(player.getName()); + out.writeUTF(MineverseChatAPI.getMineverseChatPlayer(mcp.getReplyPlayer()).getName()); out.writeUTF(mcp.getUUID().toString()); out.writeUTF(mcp.getName()); out.writeUTF(send); diff --git a/src/mineverse/Aust1n46/chat/command/message/Spy.java b/src/mineverse/Aust1n46/chat/command/message/Spy.java index 72d4a3b..4c77cc9 100644 --- a/src/mineverse/Aust1n46/chat/command/message/Spy.java +++ b/src/mineverse/Aust1n46/chat/command/message/Spy.java @@ -23,7 +23,7 @@ public class Spy extends MineverseCommand { plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } - MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); + MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); if(mcp.getPlayer().hasPermission("venturechat.spy")) { if(!mcp.isSpy()) { mcp.setSpy(true); diff --git a/src/mineverse/Aust1n46/chat/listeners/CommandListener.java b/src/mineverse/Aust1n46/chat/listeners/CommandListener.java index b486c7e..bf3d47c 100644 --- a/src/mineverse/Aust1n46/chat/listeners/CommandListener.java +++ b/src/mineverse/Aust1n46/chat/listeners/CommandListener.java @@ -217,7 +217,7 @@ public class CommandListener implements CommandExecutor, Listener { plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player."); return true; } - MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); + MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer((Player) sender); for(ChatChannel channel : ChatChannel.getChannels()) { if(command.getName().toLowerCase().equals(channel.getAlias())) { if(args.length == 0) { diff --git a/src/mineverse/Aust1n46/chat/listeners/LoginListener.java b/src/mineverse/Aust1n46/chat/listeners/LoginListener.java index e1f77e6..72c1294 100644 --- a/src/mineverse/Aust1n46/chat/listeners/LoginListener.java +++ b/src/mineverse/Aust1n46/chat/listeners/LoginListener.java @@ -121,7 +121,7 @@ public class LoginListener implements Listener { } private void playerLeaving(Player player) { - MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer(player); + MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer(player); ConfigurationSection cs = playerData.getConfigurationSection("players." + mcp.getUUID().toString()); if(mcp.getPlayer() == null) { return; diff --git a/src/mineverse/Aust1n46/chat/listeners/SignListener.java b/src/mineverse/Aust1n46/chat/listeners/SignListener.java index 41c4c41..240d098 100644 --- a/src/mineverse/Aust1n46/chat/listeners/SignListener.java +++ b/src/mineverse/Aust1n46/chat/listeners/SignListener.java @@ -16,7 +16,7 @@ public class SignListener implements Listener { @EventHandler(priority = EventPriority.HIGH) public void onSignChange(SignChangeEvent event) { - MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer(event.getPlayer()); + MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer(event.getPlayer()); for(int a = 0; a < event.getLines().length; a++) { String line = event.getLine(a); if(mcp.getPlayer().hasPermission("venturechat.color.legacy")) {