From 6191af39d88310bd0c6892f5a3450470e31a6743 Mon Sep 17 00:00:00 2001
From: cnaude <cnaude@zebra>
Date: Sun, 1 Mar 2015 19:09:38 -0700
Subject: [PATCH] Fix bug with custom-prefixes

---
 dependency-reduced-pom.xml                             |  6 ++++++
 pom.xml                                                |  7 +++++++
 src/main/java/com/cnaude/purpleirc/PurpleBot.java      | 10 +++++-----
 .../com/cnaude/purpleirc/Utilities/ChatTokenizer.java  |  2 +-
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index 3538991..b1b5b0b 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -186,6 +186,12 @@
       <version>5.6.7</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>com.cnaude.mineversechat</groupId>
+      <artifactId>MineverseChat</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>com.cnaude.jobs</groupId>
       <artifactId>Jobs</artifactId>
diff --git a/pom.xml b/pom.xml
index f058adb..24bdbcc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,6 +142,13 @@
             <version>5.6.7</version>
         </dependency>
         
+        <!-- MineverseChat -->
+        <dependency>
+            <groupId>com.cnaude.mineversechat</groupId>
+            <artifactId>MineverseChat</artifactId>
+            <version>2.0</version>
+        </dependency>
+        
         <!-- Jobs -->
         <dependency>
             <groupId>com.cnaude.jobs</groupId>
diff --git a/src/main/java/com/cnaude/purpleirc/PurpleBot.java b/src/main/java/com/cnaude/purpleirc/PurpleBot.java
index d937c61..cc82c3e 100644
--- a/src/main/java/com/cnaude/purpleirc/PurpleBot.java
+++ b/src/main/java/com/cnaude/purpleirc/PurpleBot.java
@@ -50,7 +50,6 @@ import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import me.botsko.prism.actionlibs.QueryParameters;
 import me.botsko.prism.events.BlockStateChange;
@@ -686,11 +685,12 @@ public final class PurpleBot {
             for (String s : config.getStringList("custom-prefixes")) {
                 String pair[] = s.split(" ", 2);
                 if (pair.length > 0) {
-                    String token = ChatColor.translateAlternateColorCodes('&', pair[1]);
-                    userPrefixes.put(pair[0], token);
-                    plugin.logDebug("CustomPrefix: " + pair[0] + " => " + token);
+                    userPrefixes.put(pair[0], ChatColor.translateAlternateColorCodes('&', pair[1]));  
                 }
             }
+            for (String key : userPrefixes.keySet()) {
+                plugin.logDebug(" CustomPrefix: " + key + " => " + userPrefixes.get(key));
+            }
             defaultCustomPrefix = ChatColor.translateAlternateColorCodes('&', config.getString("custom-prefix-default", "[IRC]"));
 
             for (String s : config.getStringList("replace-first-occurrences")) {
@@ -2307,7 +2307,7 @@ public final class PurpleBot {
                 if (user.getNick().equalsIgnoreCase(key) || checkUserMask(user, key)) {
                     CaseInsensitiveMap cm = firstOccurrenceReplacements.get(key);
                     for (Object obj : cm.keySet()) {
-                        message = message.replaceFirst((String)obj, ChatColor.translateAlternateColorCodes('&',(String)cm.get(obj)));
+                        message = message.replaceFirst((String) obj, ChatColor.translateAlternateColorCodes('&', (String) cm.get(obj)));
                     }
                 }
             }
diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java b/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java
index 9ba2600..3c6ed57 100644
--- a/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java
+++ b/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java
@@ -78,7 +78,7 @@ public class ChatTokenizer {
         plugin.logDebug("customPrefix before: " + customPrefix);
         if (!ircBot.userPrefixes.isEmpty()) {
             for (String key : ircBot.userPrefixes.keySet()) {
-                if (ircBot.userPrefixes.containsKey(user.getNick()) || ircBot.checkUserMask(user, key)) {
+                if (key.equalsIgnoreCase(user.getNick()) || ircBot.checkUserMask(user, key)) {
                     customPrefix = ircBot.userPrefixes.get(key);
                     break;
                 }