From 9eab2165252062d5a978e06badd4efc5287210ae Mon Sep 17 00:00:00 2001
From: zeeZ <zeeZinator+github@gmail.com>
Date: Sun, 8 May 2011 18:26:40 +0200
Subject: [PATCH] Use Bukkit's way to strip colors.

---
 src/main/java/org/dynmap/Client.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/dynmap/Client.java b/src/main/java/org/dynmap/Client.java
index 3cc5ba08..28a3deb7 100644
--- a/src/main/java/org/dynmap/Client.java
+++ b/src/main/java/org/dynmap/Client.java
@@ -1,5 +1,7 @@
 package org.dynmap;
 
+import org.bukkit.ChatColor;
+
 public class Client {
     public static class Update {
         public long timestamp;
@@ -15,7 +17,7 @@ public class Client {
         public double x, y, z;
 
         public Player(String name, String world, double x, double y, double z) {
-            this.name = name.replaceAll("\u00A7[0-9a-fA-F]", "");
+            this.name = ChatColor.stripColor(name);
             this.world = world;
             this.x = x;
             this.y = y;
@@ -35,8 +37,8 @@ public class Client {
 
         public ChatMessage(String source, String playerName, String message) {
             this.source = source;
-            this.playerName = playerName.replaceAll("\u00A7[0-9a-fA-F]", "");
-            this.message = message.replaceAll("\u00A7[0-9a-fA-F]", "");
+            this.playerName = ChatColor.stripColor(playerName);
+            this.message = ChatColor.stripColor(message);
         }
     }
     
@@ -44,7 +46,7 @@ public class Client {
         public String type = "playerjoin";
         public String playerName;
         public PlayerJoinMessage(String playerName) {
-            this.playerName = playerName.replaceAll("\u00A7[0-9a-fA-F]", "");
+            this.playerName = ChatColor.stripColor(playerName);
         }
     }
     
@@ -52,7 +54,7 @@ public class Client {
         public String type = "playerquit";
         public String playerName;
         public PlayerQuitMessage(String playerName) {
-            this.playerName = playerName.replaceAll("\u00A7[0-9a-fA-F]", "");
+            this.playerName = ChatColor.stripColor(playerName);
         }
     }