diff --git a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java index 86c3375..07e6d5b 100755 --- a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java +++ b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java @@ -180,7 +180,7 @@ public class DiscordPlugin extends ButtonPlugin { Component.registerComponent(this, new GameRoleModule()); //Needs the mainServer to be set Component.registerComponent(this, new AnnouncerModule()); Component.registerComponent(this, new FunModule()); - new ChromaBot(this).updatePlayerList(); //Initialize ChromaBot - The MCCHatModule is tested to be enabled + new ChromaBot(this).updatePlayerList(); //Initialize ChromaBot - The MCChatModule is tested to be enabled getManager().registerCommand(new VersionCommand()); getManager().registerCommand(new UserinfoCommand()); diff --git a/src/main/java/buttondevteam/discordplugin/mcchat/MCChatListener.java b/src/main/java/buttondevteam/discordplugin/mcchat/MCChatListener.java index e7cfb45..90b709c 100755 --- a/src/main/java/buttondevteam/discordplugin/mcchat/MCChatListener.java +++ b/src/main/java/buttondevteam/discordplugin/mcchat/MCChatListener.java @@ -225,6 +225,7 @@ public class MCChatListener implements Listener { timings.printElapsed("Chat event"); val author = ev.getMessage().getAuthor(); final boolean hasCustomChat = MCChatCustom.hasCustomChat(ev.getMessage().getChannelId()); + var prefix = DiscordPlugin.getPrefix(); return ev.getMessage().getChannel().filter(channel -> { timings.printElapsed("Filter 1"); return !(ev.getMessage().getChannelId().asLong() != module.chatChannel().get().asLong() @@ -236,7 +237,7 @@ public class MCChatListener implements Listener { return !(channel instanceof PrivateChannel //Only in private chat && ev.getMessage().getContent().isPresent() && ev.getMessage().getContent().get().length() < "/mcchat<>".length() - && ev.getMessage().getContent().get().replace("/", "") + && ev.getMessage().getContent().get().replace(prefix + "", "") .equalsIgnoreCase("mcchat")); //Either mcchat or /mcchat //Allow disabling the chat if needed }).filterWhen(channel -> CommandListener.runCommand(ev.getMessage(), channel, true)) diff --git a/src/main/java/buttondevteam/discordplugin/mcchat/MCChatUtils.java b/src/main/java/buttondevteam/discordplugin/mcchat/MCChatUtils.java index f8e8ab7..77e7671 100644 --- a/src/main/java/buttondevteam/discordplugin/mcchat/MCChatUtils.java +++ b/src/main/java/buttondevteam/discordplugin/mcchat/MCChatUtils.java @@ -53,7 +53,7 @@ public class MCChatUtils { LastMsgData lastmsgdata; static LongObjectHashMap lastmsgfromd = new LongObjectHashMap<>(); // Last message sent by a Discord user, used for clearing checkmarks private static MinecraftChatModule module; - private static HashMap, HashSet> staticExcludedPlugins = new HashMap<>(); + private static final HashMap, HashSet> staticExcludedPlugins = new HashMap<>(); public static void updatePlayerList() { val mod = getModule(); diff --git a/src/main/java/buttondevteam/discordplugin/mcchat/MinecraftChatModule.java b/src/main/java/buttondevteam/discordplugin/mcchat/MinecraftChatModule.java index 7813813..740da5e 100644 --- a/src/main/java/buttondevteam/discordplugin/mcchat/MinecraftChatModule.java +++ b/src/main/java/buttondevteam/discordplugin/mcchat/MinecraftChatModule.java @@ -75,7 +75,7 @@ public class MinecraftChatModule extends Component { /** * If this is on, each chat channel will have a player list in their description. * It only gets added if there's no description yet or there are (at least) two lines of "----" following each other. - * Note that it will replace everything between the first and last "----" but it will only detect exactly four dashes. + * Note that it will replace everything above the first and below the last "----" but it will only detect exactly four dashes. * So if you want to use dashes for something else in the description, make sure it's either less or more dashes in one line. */ public ConfigData showPlayerListOnDC() {