diff --git a/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java b/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java index 8829ab8b..1fe5ec19 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java @@ -73,12 +73,6 @@ public class ChatManager extends FreedomService return; } - if (message.startsWith("Connected using PickaxeChat for ")) - { - event.setCancelled(true); - return; - } - // Truncate messages that are too long - 256 characters is vanilla client max if (message.length() > 256) { @@ -230,4 +224,4 @@ public class ChatManager extends FreedomService } } } -} +} \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java b/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java index f579382a..60ea9537 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java @@ -292,6 +292,12 @@ public class Discord extends FreedomService { message = StringUtils.remove(message, "@"); } + + if (message.toLowerCase().contains("discord.gg")) + { + return; + } + if (enabled && !chat_channel_id.isEmpty()) { CompletableFuture sentMessage = bot.getTextChannelById(chat_channel_id).sendMessage(message).submit(true); @@ -482,4 +488,4 @@ public class Discord extends FreedomService return false; } -} +} \ No newline at end of file