From 63b9579fa5d575234d65941004613ec367ed6041 Mon Sep 17 00:00:00 2001
From: zeeZ <zeeZinator+github@gmail.com>
Date: Sun, 1 May 2011 23:11:29 +0200
Subject: [PATCH] Strip colors off chat, use getDisplayName instead of getName

---
 src/main/java/org/dynmap/Client.java                   | 10 +++++-----
 src/main/java/org/dynmap/DynmapPlayerChatListener.java |  6 +++---
 src/main/java/org/dynmap/JsonTimerTask.java            |  2 +-
 .../org/dynmap/web/handlers/ClientUpdateHandler.java   |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/dynmap/Client.java b/src/main/java/org/dynmap/Client.java
index fc5c96bd..3cc5ba08 100644
--- a/src/main/java/org/dynmap/Client.java
+++ b/src/main/java/org/dynmap/Client.java
@@ -15,7 +15,7 @@ public class Client {
         public double x, y, z;
 
         public Player(String name, String world, double x, double y, double z) {
-            this.name = name;
+            this.name = name.replaceAll("\u00A7[0-9a-fA-F]", "");
             this.world = world;
             this.x = x;
             this.y = y;
@@ -35,8 +35,8 @@ public class Client {
 
         public ChatMessage(String source, String playerName, String message) {
             this.source = source;
-            this.playerName = playerName;
-            this.message = message;
+            this.playerName = playerName.replaceAll("\u00A7[0-9a-fA-F]", "");
+            this.message = message.replaceAll("\u00A7[0-9a-fA-F]", "");
         }
     }
     
@@ -44,7 +44,7 @@ public class Client {
         public String type = "playerjoin";
         public String playerName;
         public PlayerJoinMessage(String playerName) {
-            this.playerName = playerName;
+            this.playerName = playerName.replaceAll("\u00A7[0-9a-fA-F]", "");
         }
     }
     
@@ -52,7 +52,7 @@ public class Client {
         public String type = "playerquit";
         public String playerName;
         public PlayerQuitMessage(String playerName) {
-            this.playerName = playerName;
+            this.playerName = playerName.replaceAll("\u00A7[0-9a-fA-F]", "");
         }
     }
 
diff --git a/src/main/java/org/dynmap/DynmapPlayerChatListener.java b/src/main/java/org/dynmap/DynmapPlayerChatListener.java
index c732f855..f7676e34 100644
--- a/src/main/java/org/dynmap/DynmapPlayerChatListener.java
+++ b/src/main/java/org/dynmap/DynmapPlayerChatListener.java
@@ -15,17 +15,17 @@ public class DynmapPlayerChatListener extends PlayerListener {
     @Override
     public void onPlayerChat(PlayerChatEvent event) {
         if(event.isCancelled()) return;
-        plugin.mapManager.pushUpdate(new Client.ChatMessage("player", event.getPlayer().getName(), event.getMessage()));
+        plugin.mapManager.pushUpdate(new Client.ChatMessage("player", event.getPlayer().getDisplayName(), event.getMessage()));
     }
 
     @Override
     public void onPlayerJoin(PlayerJoinEvent event) {
-        plugin.mapManager.pushUpdate(new Client.PlayerJoinMessage(event.getPlayer().getName()));
+        plugin.mapManager.pushUpdate(new Client.PlayerJoinMessage(event.getPlayer().getDisplayName()));
     }
 
     @Override
     public void onPlayerQuit(PlayerQuitEvent event) {
-        plugin.mapManager.pushUpdate(new Client.PlayerQuitMessage(event.getPlayer().getName()));
+        plugin.mapManager.pushUpdate(new Client.PlayerQuitMessage(event.getPlayer().getDisplayName()));
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/org/dynmap/JsonTimerTask.java b/src/main/java/org/dynmap/JsonTimerTask.java
index 615d5d6f..e51b5b39 100644
--- a/src/main/java/org/dynmap/JsonTimerTask.java
+++ b/src/main/java/org/dynmap/JsonTimerTask.java
@@ -89,7 +89,7 @@ class JsonTimerTask extends TimerTask {
             for (int i = 0; i < players.length; i++) {
                 Player p = players[i];
                 Location pl = p.getLocation();
-                update.players[i] = new Client.Player(p.getName(), pl.getWorld().getName(), pl.getX(), pl.getY(), pl.getZ());
+                update.players[i] = new Client.Player(p.getDisplayName(), pl.getWorld().getName(), pl.getX(), pl.getY(), pl.getZ());
             }
 
             update.updates = mapManager.getWorldUpdates(world.getName(), current - (jsonInterval + 10000));
diff --git a/src/main/java/org/dynmap/web/handlers/ClientUpdateHandler.java b/src/main/java/org/dynmap/web/handlers/ClientUpdateHandler.java
index 2df01836..04c201d6 100644
--- a/src/main/java/org/dynmap/web/handlers/ClientUpdateHandler.java
+++ b/src/main/java/org/dynmap/web/handlers/ClientUpdateHandler.java
@@ -71,7 +71,7 @@ public class ClientUpdateHandler implements HttpHandler {
         for(int i=0;i<players.length;i++) {
             Player p = players[i];
             Location pl = p.getLocation();
-            update.players[i] = new Client.Player(p.getName(), pl.getWorld().getName(), pl.getX(), pl.getY(), pl.getZ());
+            update.players[i] = new Client.Player(p.getDisplayName(), pl.getWorld().getName(), pl.getX(), pl.getY(), pl.getZ());
         }
         
         update.updates = mapManager.getWorldUpdates(worldName, since);