From 41f6cc342df15fe10eb334734f4666ca9de74d82 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Sun, 18 Dec 2016 12:58:37 +0100 Subject: [PATCH] Made msgs not send to Discord if cancelled --- .../discordplugin/listeners/MCChatListener.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java index 84efbe5..d68a42d 100644 --- a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java +++ b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java @@ -22,6 +22,8 @@ import sx.blah.discord.handle.obj.IUser; public class MCChatListener implements Listener, IListener { @EventHandler // Minecraft public void onMCChat(TBMCChatEvent e) { + if (e.isCancelled()) + return; if (e.getSender() instanceof DiscordSender || e.getSender() instanceof DiscordPlayerSender) return; if (e.getChannel().equals(Channel.GlobalChat)) @@ -32,8 +34,8 @@ public class MCChatListener implements Listener, IListener + DiscordPlugin.sanitizeString(e.getMessage())); } - private static final String[] UnconnectedCmds = new String[] { "list", "u", "shrug", "tableflip", "unflip", - "mwiki", "t" }; + private static final String[] UnconnectedCmds = new String[] { "list", "u", "shrug", "tableflip", "unflip", "mwiki", + "t" }; public static final HashMap UnconnectedSenders = new HashMap<>(); public static final HashMap ConnectedSenders = new HashMap<>();