Potential reset code. hacky

CraftIRC · Dec 2, 2012 · cdb1c1b · cdb1c1b
1 parent 68de281
commit cdb1c1b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/config.yml b/config.yml
@@ -284,6 +284,7 @@ colormap:
   - {irc: 13, game: "\u00A7d", name: 'magenta'}
   - {irc: 8, game: "\u00A7e", name: 'yellow'}
   - {irc: 1, game: "\u00A7f", name: 'foreground'}
+  - {irc: -1, game: "\u00Afr", name: 'reset'}
 
 
 # ******************* REPLACEMENT FILTERS *******************

diff --git a/src/com/ensifera/animosity/craftirc/CraftIRC.java b/src/com/ensifera/animosity/craftirc/CraftIRC.java
@@ -20,6 +20,7 @@
 
 import com.ensifera.animosity.craftirc.libs.com.sk89q.util.config.Configuration;
 import com.ensifera.animosity.craftirc.libs.com.sk89q.util.config.ConfigurationNode;
+import com.ensifera.animosity.craftirc.libs.org.jibble.pircbot.Colors;
 
 /**
  * @author Animosity
@@ -881,7 +882,8 @@ public String colorizeName(String name) {
         final Pattern color_codes = Pattern.compile(ChatColor.COLOR_CHAR + "[0-9a-fk-r]");
         Matcher find_colors = color_codes.matcher(name);
         while (find_colors.find()) {
-            name = find_colors.replaceFirst(Character.toString((char) 3) + this.cColorIrcFromGame(find_colors.group()));
+            String color = this.cColorIrcFromGame(find_colors.group());
+            name = find_colors.replaceFirst(color.equals("-1") ? Colors.NORMAL: Character.toString((char) 3) + color);
             find_colors = color_codes.matcher(name);
         }
         return name;