Adjust event priority and channel shortcut commands so that the plugi…

…n works with mute plugins
WiIIiam278 · Jul 20, 2021 · e4b1fe7 · e4b1fe7
1 parent 7b0cdfc
commit e4b1fe7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -114,6 +114,12 @@
             <version>5.3</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>me.leoko.advancedban</groupId>
+            <artifactId>AdvancedBan</artifactId>
+            <version>2.1.7</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>

diff --git a/src/main/java/me/william278/huskchat/commands/ChannelShortcutCommand.java b/src/main/java/me/william278/huskchat/commands/ChannelShortcutCommand.java
@@ -29,7 +29,10 @@ public void execute(CommandSender sender, String[] args) {
                     message.append(arg).append(" ");
                 }
                 final String messageToSend = message.toString();
-                PlayerListener.sendChatMessage(channelId, player, messageToSend);
+                final String oldChannelID = HuskChat.getPlayerChannel(player.getUniqueId());
+                HuskChat.setPlayerChannel(player.getUniqueId(), channelId);
+                player.chat(messageToSend);
+                HuskChat.setPlayerChannel(player.getUniqueId(), oldChannelID);
             }
         }
     }

diff --git a/src/main/java/me/william278/huskchat/listeners/PlayerListener.java b/src/main/java/me/william278/huskchat/listeners/PlayerListener.java
@@ -8,13 +8,14 @@
 import net.md_5.bungee.api.event.ChatEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
+import net.md_5.bungee.event.EventPriority;
 
 import java.util.HashSet;
 import java.util.Locale;
 
 public class PlayerListener implements Listener {
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerChat(ChatEvent e) {
         if (e.isCommand() || e.isProxyCommand()) {
             return;