Upstream/PurpleIRC-spigot
1
0
Fork 0
mirror of https://github.com/cnaude/PurpleIRC-spigot.git synced 2025-02-03 05:01:25 +01:00
Code Issues Projects Releases Wiki Activity

Faction tag filter fix.

Browse Source
This commit is contained in:
cnaude 2016-12-16 15:08:56 -07:00
parent 15177269dc
commit 09c79d7c9a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/cnaude/purpleirc/PurpleBot.java
View File

@ -134,8 +134,8 @@ public final class PurpleBot {
public CaseInsensitiveMap<Collection<String>> tabIgnoreNicks; public CaseInsensitiveMap<Collection<String>> tabIgnoreNicks;
public CaseInsensitiveMap<Boolean> tabIgnoreDuplicates; public CaseInsensitiveMap<Boolean> tabIgnoreDuplicates;
public CaseInsensitiveMap<Collection<String>> filters; public CaseInsensitiveMap<Collection<String>> filters;
public CaseInsensitiveMap<Collection<String>> factionTagFilters;
public ArrayList<String> tailerFilters; public ArrayList<String> tailerFilters;
public ArrayList<String> factionTagFilters;
public CaseInsensitiveMap<String> channelPassword; public CaseInsensitiveMap<String> channelPassword;
public CaseInsensitiveMap<String> channelTopic; public CaseInsensitiveMap<String> channelTopic;
public CaseInsensitiveMap<Boolean> channelTopicChanserv; public CaseInsensitiveMap<Boolean> channelTopicChanserv;
@ -269,7 +269,7 @@ public final class PurpleBot {
this.tabIgnoreDuplicates = new CaseInsensitiveMap<>(); this.tabIgnoreDuplicates = new CaseInsensitiveMap<>();
this.filters = new CaseInsensitiveMap<>(); this.filters = new CaseInsensitiveMap<>();
this.tailerFilters = new ArrayList<>(); this.tailerFilters = new ArrayList<>();
this.factionTagFilters = new ArrayList<>(); this.factionTagFilters = new CaseInsensitiveMap<>();
this.channelNicks = new CaseInsensitiveMap<>(); this.channelNicks = new CaseInsensitiveMap<>();
this.rawMessages = new ArrayList<>(); this.rawMessages = new ArrayList<>();
this.channelTopicChanserv = new CaseInsensitiveMap<>(); this.channelTopicChanserv = new CaseInsensitiveMap<>();
@ -1158,7 +1158,7 @@ public final class PurpleBot {
} }
plugin.logDebug(" Filtered Faction Tag => " + word); plugin.logDebug(" Filtered Faction Tag => " + word);
} }
filters.put(channelName, ft); factionTagFilters.put(channelName, ft);
if (factionTagFilters.isEmpty()) { if (factionTagFilters.isEmpty()) {
plugin.logInfo("Faction Filter list is empty!"); plugin.logInfo("Faction Filter list is empty!");
} }
@ -1322,7 +1322,7 @@ public final class PurpleBot {
plugin.logDebug("Faction [Player: " + player.getName() plugin.logDebug("Faction [Player: " + player.getName()
+ "] [Tag: " + playerFactionName + "] [Mode: " + "] [Tag: " + playerFactionName + "] [Mode: "
+ playerChatMode + "]"); + playerChatMode + "]");
if (factionTagFilters.contains(playerFactionName)) { if (factionTagFilters.get(channelName).contains(playerFactionName)) {
plugin.logDebug("Filtered out message due to tag filter."); plugin.logDebug("Filtered out message due to tag filter.");
} else { } else {
if (enabledMessages.get(channelName) if (enabledMessages.get(channelName)