From 4fb1ddf49a1f8c47c611cfd695b8f9b8f5183083 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Sat, 21 May 2011 00:59:08 -0500
Subject: [PATCH] Fix for skins on players with nicknames - send up account
 name as well as display name.

---
 src/main/java/org/dynmap/Client.java                         | 4 +++-
 src/main/java/org/dynmap/JsonTimerTask.java                  | 3 ++-
 .../java/org/dynmap/web/handlers/ClientUpdateHandler.java    | 3 ++-
 web/js/map.js                                                | 5 +++--
 web/js/playermarkers.js                                      | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/dynmap/Client.java b/src/main/java/org/dynmap/Client.java
index 5ada186e..78d7de31 100644
--- a/src/main/java/org/dynmap/Client.java
+++ b/src/main/java/org/dynmap/Client.java
@@ -18,14 +18,16 @@ public class Client {
         public String world;
         public double x, y, z;
         public int health;
+        public String account;
 
-        public Player(String name, String world, double x, double y, double z, int health) {
+        public Player(String name, String world, double x, double y, double z, int health, String account) {
             this.name = ChatColor.stripColor(name);
             this.world = world;
             this.x = x;
             this.y = y;
             this.z = z;
             this.health = health;
+            this.account = account;
         }
     }
 
diff --git a/src/main/java/org/dynmap/JsonTimerTask.java b/src/main/java/org/dynmap/JsonTimerTask.java
index 2f4d3db7..622ab177 100644
--- a/src/main/java/org/dynmap/JsonTimerTask.java
+++ b/src/main/java/org/dynmap/JsonTimerTask.java
@@ -99,7 +99,8 @@ 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.getDisplayName(), pl.getWorld().getName(), pl.getX(), pl.getY(), pl.getZ(), showHealth?p.getHealth():-1);
+                update.players[i] = new Client.Player(p.getDisplayName(), pl.getWorld().getName(), pl.getX(), pl.getY(), pl.getZ(), showHealth?p.getHealth():-1,
+                        p.getName());
             }
 
             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 7f15700e..b0cb2124 100644
--- a/src/main/java/org/dynmap/web/handlers/ClientUpdateHandler.java
+++ b/src/main/java/org/dynmap/web/handlers/ClientUpdateHandler.java
@@ -76,7 +76,8 @@ 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.getDisplayName(), pl.getWorld().getName(), pl.getX(), pl.getY(), pl.getZ(), showHealth?p.getHealth():-1);
+            update.players[i] = new Client.Player(p.getDisplayName(), pl.getWorld().getName(), pl.getX(), pl.getY(), pl.getZ(), showHealth?p.getHealth():-1,
+                    p.getName());
         }
 
         update.updates = mapManager.getWorldUpdates(worldName, since);
diff --git a/web/js/map.js b/web/js/map.js
index b69a29af..af0890cd 100644
--- a/web/js/map.js
+++ b/web/js/map.js
@@ -453,7 +453,8 @@ DynMap.prototype = {
 		var player = me.players[update.name] = {
 				name: update.name,
 				location: new Location(me.worlds[update.world], parseFloat(update.x), parseFloat(update.y), parseFloat(update.z)),
-				health: update.health
+				health: update.health,
+                account: update.account
 		};
 		
 		$(me).trigger('playeradded', [ player ]);
@@ -486,7 +487,7 @@ DynMap.prototype = {
 			})
 			.appendTo(me.playerlist);
 		if (me.options.showplayerfacesinmenu) {
-			getMinecraftHead(player.name, 16, function(head) {
+			getMinecraftHead(player.account, 16, function(head) {
 				$('img', playerIconContainer).remove();
 				$(head).appendTo(playerIconContainer);
 			});
diff --git a/web/js/playermarkers.js b/web/js/playermarkers.js
index 7574b4ff..f0a48bff 100644
--- a/web/js/playermarkers.js
+++ b/web/js/playermarkers.js
@@ -15,7 +15,7 @@ componentconstructors['playermarkers'] = function(dynmap, configuration) {
 					.text(player.name));
 			
 			if (configuration.showplayerfaces) {
-				getMinecraftHead(player.name, 32, function(head) {
+				getMinecraftHead(player.account, 32, function(head) {
 					$(head)
 						.addClass('playericon')
 						.prependTo(div);