Merge remote-tracking branch 'origin/master' into master

xGinko · Dec 10, 2021 · 91ba5ac · 91ba5ac
2 parents 262a1f9 + 1f11d4e
commit 91ba5ac
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/main/java/me/moomoo/anarchyexploitfixes/misc/Chat.java b/src/main/java/me/moomoo/anarchyexploitfixes/misc/Chat.java
@@ -96,10 +96,13 @@ private void onChat(AsyncPlayerChatEvent event) {
 
     @EventHandler
     private void onPreProcess(PlayerCommandPreprocessEvent event) {
-        if (plugin.getConfig().getBoolean("AntiSpamCommands")) {
-            if (handleChatSpam(event.getPlayer(), event.getMessage())) {
-                event.setCancelled(true);
-            }
+        if (!plugin.getConfig().getBoolean("AntiSpamCommands"))
+            return;
+        if (plugin.getConfig().getBoolean("AntiSpamCommandsUseWhitelist")
+                && plugin.getConfig().getStringList("AntiSpamCommandsWhitelist").stream().noneMatch(s -> event.getMessage().toLowerCase().startsWith(s.toLowerCase())))
+            return;
+        if (handleChatSpam(event.getPlayer(), event.getMessage())) {
+            event.setCancelled(true);
         }
     }
 

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -96,6 +96,15 @@ AntiSpamMessagesPerTime: 10 # ~1 message every 3 seconds if constantly spamming
 AntiSpamWordTime: 60
 AntiSpamLinkTime: 300
 AntiSpamCommands: true # Use the same antispam options for commands aswell.
+AntiSpamCommandsUseWhitelist: false
+AntiSpamCommandsWhitelist:
+  - /msg
+  - /message
+  - /r
+  - /reply
+  - /w
+  - /whisper
+  - /tell
 CharacterLimit: 128
 PreventUnicodeDot: true
 MoreLenientLinkCheck: true # Won't get triggered by just the word discord and dc