From 09c79d7c9a5eed52e83da8e175702701b30c55fe Mon Sep 17 00:00:00 2001 From: cnaude Date: Fri, 16 Dec 2016 15:08:56 -0700 Subject: [PATCH] Faction tag filter fix. --- src/main/java/com/cnaude/purpleirc/PurpleBot.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/cnaude/purpleirc/PurpleBot.java b/src/main/java/com/cnaude/purpleirc/PurpleBot.java index fa0bc49..8675aab 100644 --- a/src/main/java/com/cnaude/purpleirc/PurpleBot.java +++ b/src/main/java/com/cnaude/purpleirc/PurpleBot.java @@ -134,8 +134,8 @@ public final class PurpleBot { public CaseInsensitiveMap> tabIgnoreNicks; public CaseInsensitiveMap tabIgnoreDuplicates; public CaseInsensitiveMap> filters; - public ArrayList tailerFilters; - public ArrayList factionTagFilters; + public CaseInsensitiveMap> factionTagFilters; + public ArrayList tailerFilters; public CaseInsensitiveMap channelPassword; public CaseInsensitiveMap channelTopic; public CaseInsensitiveMap channelTopicChanserv; @@ -269,7 +269,7 @@ public final class PurpleBot { this.tabIgnoreDuplicates = new CaseInsensitiveMap<>(); this.filters = new CaseInsensitiveMap<>(); this.tailerFilters = new ArrayList<>(); - this.factionTagFilters = new ArrayList<>(); + this.factionTagFilters = new CaseInsensitiveMap<>(); this.channelNicks = new CaseInsensitiveMap<>(); this.rawMessages = new ArrayList<>(); this.channelTopicChanserv = new CaseInsensitiveMap<>(); @@ -1158,7 +1158,7 @@ public final class PurpleBot { } plugin.logDebug(" Filtered Faction Tag => " + word); } - filters.put(channelName, ft); + factionTagFilters.put(channelName, ft); if (factionTagFilters.isEmpty()) { plugin.logInfo("Faction Filter list is empty!"); } @@ -1322,7 +1322,7 @@ public final class PurpleBot { plugin.logDebug("Faction [Player: " + player.getName() + "] [Tag: " + playerFactionName + "] [Mode: " + playerChatMode + "]"); - if (factionTagFilters.contains(playerFactionName)) { + if (factionTagFilters.get(channelName).contains(playerFactionName)) { plugin.logDebug("Filtered out message due to tag filter."); } else { if (enabledMessages.get(channelName)