From 354c9078b19239f3c5e5b1830c47959bdd458398 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 31 Jul 2018 16:16:02 +0200 Subject: [PATCH] Case insensitive check for ignored chat commands Fixes #651 --- src/main/java/de/diddiz/LogBlock/Consumer.java | 9 ++++++--- src/main/java/de/diddiz/LogBlock/config/Config.java | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/diddiz/LogBlock/Consumer.java b/src/main/java/de/diddiz/LogBlock/Consumer.java index 9639a0c..913b713 100644 --- a/src/main/java/de/diddiz/LogBlock/Consumer.java +++ b/src/main/java/de/diddiz/LogBlock/Consumer.java @@ -376,9 +376,12 @@ public class Consumer extends TimerTask { } public void queueChat(Actor player, String message) { - for (String ignored : Config.ignoredChat) { - if (message.startsWith(ignored)) { - return; + if (!Config.ignoredChat.isEmpty()) { + String lowerCaseMessage = message.toLowerCase(); + for (String ignored : Config.ignoredChat) { + if (lowerCaseMessage.startsWith(ignored)) { + return; + } } } if (hiddenPlayers.contains(player.getName().toLowerCase())) { diff --git a/src/main/java/de/diddiz/LogBlock/config/Config.java b/src/main/java/de/diddiz/LogBlock/config/Config.java index d271ab7..b6df65a 100644 --- a/src/main/java/de/diddiz/LogBlock/config/Config.java +++ b/src/main/java/de/diddiz/LogBlock/config/Config.java @@ -44,7 +44,7 @@ public class Config { public static String banPermission; public static Set hiddenBlocks; public static Set hiddenPlayers; - public static Set ignoredChat; + public static List ignoredChat; public static SimpleDateFormat formatter; public static boolean safetyIdCheck; public static boolean debug; @@ -176,9 +176,9 @@ public class Config { throw new DataFormatException("Not a valid material in hiddenBlocks: '" + blocktype + "'"); } } - ignoredChat = new HashSet(); + ignoredChat = new ArrayList(); for (String chatCommand : config.getStringList("logging.ignoredChat")) { - ignoredChat.add(chatCommand); + ignoredChat.add(chatCommand.toLowerCase()); } dontRollback = new HashSet(); for (String e : config.getStringList("rollback.dontRollback")) {