fix plugin scanning prevention

xGinko · Dec 27, 2023 · 52c1151 · 52c1151
1 parent 70abf9e
commit 52c1151
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/...Folia/src/main/java/me/moomoo/anarchyexploitfixes/modules/chat/PreventPluginScanning.java b/...Folia/src/main/java/me/moomoo/anarchyexploitfixes/modules/chat/PreventPluginScanning.java
@@ -14,7 +14,7 @@ public class PreventPluginScanning implements AnarchyExploitFixesModule, Listene
 
     /*
      *     Credits go to YouHaveTrouble (https://github.com/YouHaveTrouble/CommandWhitelist)
-     *     Code was mainly only implemented into AEF by xGinko.
+     *     Code was only implemented into AEF by xGinko.
      */
 
     public PreventPluginScanning() {}
@@ -37,7 +37,8 @@ public void enable() {
 
     @Override
     public boolean shouldEnable() {
-        return AnarchyExploitFixes.getConfiguration().getBoolean("chat.prevent-scanning-server-plugins.enable", true, "Prevents hacked clients running .plugins to find out what plugins the server is using");
+        return AnarchyExploitFixes.getConfiguration().getBoolean("chat.prevent-scanning-server-plugins.enable", true,
+                "Prevents hacked clients running .plugins to find out what plugins the server is using");
     }
 
     @Override
@@ -58,12 +59,12 @@ private void onAsyncCommandTabComplete(AsyncTabCompleteEvent event) {
         }
     }
 
-    @EventHandler(priority = EventPriority.NORMAL)
+    @EventHandler(priority = EventPriority.HIGHEST)
     private void onCommandTabComplete(TabCompleteEvent event) {
         if (event.getSender().hasPermission("anarchyexploitfixes.chatbypass")) return;
         if (!(event.getSender() instanceof Player)) return;
         if (isSuspectedScanPacket(event.getBuffer())) {
             event.setCancelled(true);
         }
     }
-}
+}
diff --git a/...egacy/src/main/java/me/moomoo/anarchyexploitfixes/modules/chat/PreventPluginScanning.java b/...egacy/src/main/java/me/moomoo/anarchyexploitfixes/modules/chat/PreventPluginScanning.java
@@ -13,7 +13,7 @@ public class PreventPluginScanning implements AnarchyExploitFixesModule, Listene
 
     /*
      *     Credits go to YouHaveTrouble (https://github.com/YouHaveTrouble/CommandWhitelist)
-     *     Code was mainly only implemented into AEF by xGinko.
+     *     Code was only implemented into AEF by xGinko.
      */
 
     public PreventPluginScanning() {}
@@ -36,28 +36,29 @@ public void enable() {
 
     @Override
     public boolean shouldEnable() {
-        return AnarchyExploitFixes.getConfiguration().getBoolean("chat.prevent-scanning-server-plugins.enable", true, "Prevents hacked clients running .plugins to find out what plugins the server is using");
+        return AnarchyExploitFixes.getConfiguration().getBoolean("chat.prevent-scanning-server-plugins.enable", true,
+                "Prevents hacked clients running .plugins to find out what plugins the server is using");
     }
 
-    private static boolean isSuspectedScanPacket(String buffer) {
+    private boolean isSuspectedScanPacket(String buffer) {
         return (buffer.split(" ").length == 1 && !buffer.endsWith(" ")) || !buffer.startsWith("/");
     }
 
     @EventHandler(priority = EventPriority.HIGHEST)
     private void onAsyncCommandTabComplete(AsyncTabCompleteEvent event) {
         if (event.getSender().hasPermission("anarchyexploitfixes.chatbypass")) return;
         if (!(event.getSender() instanceof Player)) return;
-        if (isSuspectedScanPacket(event.getBuffer())) {
+        if (this.isSuspectedScanPacket(event.getBuffer())) {
             event.setCancelled(true);
         }
     }
 
-    @EventHandler(priority = EventPriority.NORMAL)
+    @EventHandler(priority = EventPriority.HIGHEST)
     private void onCommandTabComplete(TabCompleteEvent event) {
         if (event.getSender().hasPermission("anarchyexploitfixes.chatbypass")) return;
         if (!(event.getSender() instanceof Player)) return;
-        if (isSuspectedScanPacket(event.getBuffer())) {
+        if (this.isSuspectedScanPacket(event.getBuffer())) {
             event.setCancelled(true);
         }
     }
-}
+}