spigot/CraftBukkit-Patches/0035-Spam-Filter-Exclusions.patch

From 4b22b24745e8b9cf218be9c9070dc41fa68065aa Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 8 Feb 2014 08:13:40 +0000
Subject: [PATCH] Spam Filter Exclusions


diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
index 8dfa8bbf3..17fc557ee 100644
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
@@ -2008,7 +2008,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
             }
             // CraftBukkit end
             this.performUnsignedChatCommand(serverboundchatcommandpacket.command());
-            this.detectRateSpam();
+            this.detectRateSpam("/" + serverboundchatcommandpacket.command()); // Spigot
         }, true); // CraftBukkit - sync commands
     }
 
@@ -2047,7 +2047,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
                 }
                 // CraftBukkit end
                 this.performSignedChatCommand(serverboundchatcommandsignedpacket, (LastSeenMessages) optional.get());
-                this.detectRateSpam();
+                this.detectRateSpam("/" + serverboundchatcommandsignedpacket.command()); // Spigot
             }, true); // CraftBukkit - sync commands
         }
     }
@@ -2334,11 +2334,20 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
         }
         // this.server.getPlayerList().broadcastChatMessage(playerchatmessage, this.player, ChatMessageType.bind(ChatMessageType.CHAT, (Entity) this.player));
         // CraftBukkit end
-        this.detectRateSpam();
+        this.detectRateSpam(s); // Spigot
     }
 
-    private void detectRateSpam() {
+    // Spigot start - spam exclusions
+    private void detectRateSpam(String s) {
         // CraftBukkit start - replaced with thread safe throttle
+        for ( String exclude : org.spigotmc.SpigotConfig.spamExclusions )
+        {
+            if ( exclude != null && s.startsWith( exclude ) )
+            {
+                return;
+            }
+        }
+        // Spigot end
         // this.chatSpamThrottler.increment();
         if (!this.chatSpamThrottler.isIncrementAndUnderThreshold() && !this.server.getPlayerList().isOp(this.player.getGameProfile()) && !this.server.isSingleplayerOwner(this.player.getGameProfile())) {
             // CraftBukkit end
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 5b7e17ee0..5565f1dd0 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -6,6 +6,7 @@ import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -284,4 +285,13 @@ public class SpigotConfig
     {
         playerShuffle = getInt( "settings.player-shuffle", 0 );
     }
+
+    public static List<String> spamExclusions;
+    private static void spamExclusions()
+    {
+        spamExclusions = getList( "commands.spam-exclusions", Arrays.asList( new String[]
+        {
+                "/skill"
+        } ) );
+    }
 }
-- 
2.49.0