diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chwho.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chwho.java index b7edd9a..c83b94a 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chwho.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chwho.java @@ -212,7 +212,7 @@ public class Chwho extends MineverseCommand { locreceip = p2.getLocation(); if(locreceip.getWorld() == p1.getWorld()) { diff = locreceip.subtract(locsender); - if(Math.abs(diff.getX()) > chDistance || Math.abs(diff.getZ()) > chDistance) { + if(Math.abs(diff.getX()) > chDistance || Math.abs(diff.getZ()) > chDistance || Math.abs(diff.getY()) > chDistance) { return false; } } diff --git a/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java b/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java index a86db61..2040e04 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java +++ b/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java @@ -43,7 +43,7 @@ public class ChatListener implements Listener { } // this event isn't always asynchronous even though the event's name starts with "Async" - // blame md_5 for that one (•_•) + // blame md_5 for that one (�_�) @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onAsyncPlayerChatEvent(AsyncPlayerChatEvent event) { event.setCancelled(true); @@ -90,16 +90,16 @@ public class ChatListener implements Listener { mcp.setConversation(null); } else { - if(tp.getIgnores().contains(mcp.getUUID())) { + if(tp.getIgnores().contains(mcp.getUUID())) { mcp.getPlayer().sendMessage(LocalizedMessage.IGNORING_MESSAGE.toString() .replace("{player}", tp.getName())); - event.setCancelled(true); + event.setCancelled(true); return; } - if(!tp.getMessageToggle()) { + if(!tp.getMessageToggle()) { mcp.getPlayer().sendMessage(LocalizedMessage.BLOCKING_MESSAGE.toString() .replace("{player}", tp.getName())); - event.setCancelled(true); + event.setCancelled(true); return; } String filtered = chat; @@ -422,7 +422,7 @@ public class ChatListener implements Listener { locreceip = p.getPlayer().getLocation(); if(locreceip.getWorld() == mcp.getPlayer().getWorld()) { diff = locreceip.subtract(locsender); - if(Math.abs(diff.getX()) > chDistance || Math.abs(diff.getZ()) > chDistance) { + if(Math.abs(diff.getX()) > chDistance || Math.abs(diff.getZ()) > chDistance || Math.abs(diff.getY()) > chDistance) { recipients.remove(p.getPlayer()); recipientCount--; continue; @@ -464,7 +464,7 @@ public class ChatListener implements Listener { String globalJSON = Format.convertToJson(mcp, format, chat); String consoleChat = format + chat; - String message = consoleChat.replaceAll("(§([a-z0-9]))", ""); + String message = consoleChat.replaceAll("(�([a-z0-9]))", ""); int hash = message.hashCode(); //Create VentureChatEvent