From 29b89513c5c52ba68a1091229e6fa7a4a6c43adb Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:01:50 +1000 Subject: [PATCH] Please don't use "null" as a spam exclusion. Guard against it anway. --- CraftBukkit-Patches/0046-Spam-Filter-Exclusions.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CraftBukkit-Patches/0046-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0046-Spam-Filter-Exclusions.patch index 4b8601001c..c3c8ee1456 100644 --- a/CraftBukkit-Patches/0046-Spam-Filter-Exclusions.patch +++ b/CraftBukkit-Patches/0046-Spam-Filter-Exclusions.patch @@ -1,11 +1,11 @@ -From 96aa10ca1474a46f04f9f3aa29c69d67b9271007 Mon Sep 17 00:00:00 2001 +From bafdd4b67c62daebb5e46fd2ec69110ea47c9a27 Mon Sep 17 00:00:00 2001 From: md_5 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 2d04541..5d669d0 100644 +index 2d04541..9f8cc39 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -837,7 +837,17 @@ public class PlayerConnection extends Connection { @@ -17,7 +17,7 @@ index 2d04541..5d669d0 100644 + boolean counted = true; + for ( String exclude : org.spigotmc.SpigotConfig.spamExclusions ) + { -+ if ( s.startsWith( exclude ) ) ++ if ( exclude != null && s.startsWith( exclude ) ) + { + counted = false; + break; @@ -28,7 +28,7 @@ index 2d04541..5d669d0 100644 Waitable waitable = new Waitable() { @Override diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 9a45d86..1ec9272 100644 +index a598954..710d12c 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -225,4 +225,13 @@ public class SpigotConfig