PaperSpigot-Parent/CraftBukkit-Patches/0050-Spam-Filter-Exclusions.patch

42 lines
1.9 KiB
Diff
Raw Normal View History

2013-06-22 07:48:42 +02:00
From 8a38b66a6ab4ae5fb449f416bbb221cafd591326 Mon Sep 17 00:00:00 2001
2013-06-21 09:59:37 +02:00
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 17:59:22 +1000
Subject: [PATCH] Spam Filter Exclusions
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 998ac8d..a292c1a 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -846,7 +846,8 @@ public class PlayerConnection extends Connection {
this.chat(s, packet3chat.a_());
// This section stays because it is only applicable to packets
- if (chatSpamField.addAndGet(this, 20) > 200 && !this.minecraftServer.getPlayerList().isOp(this.player.name)) { // CraftBukkit use thread-safe spam
+ // Spigot - spam exclusions
+ if (!org.spigotmc.SpigotConfig.spamExclusions.contains(s) && chatSpamField.addAndGet(this, 20) > 200 && !this.minecraftServer.getPlayerList().isOp(this.player.name)) { // CraftBukkit use thread-safe spam
if (packet3chat.a_()) {
Waitable waitable = new Waitable() {
@Override
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
2013-06-22 07:48:42 +02:00
index b341ee8..24b4aa0 100644
2013-06-21 09:59:37 +02:00
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
2013-06-22 06:35:20 +02:00
@@ -204,4 +204,13 @@ public class SpigotConfig
2013-06-22 07:48:42 +02:00
bungeeAddresses = getList( "settings.bungeecord-addresses", bungeeAddresses );
2013-06-21 09:59:37 +02:00
bungee = getBoolean( "settings.bungeecord", true );
}
+
+ public static List<String> spamExclusions;
2013-06-21 10:57:20 +02:00
+ private static void spamExclusions()
2013-06-21 09:59:37 +02:00
+ {
+ spamExclusions = getList( "commands.spam-exclusions", Arrays.asList( new String[]
+ {
+ "/skill"
+ } ) );
+ }
}
--
1.8.1.2