Better skin handling for colored names

CitizensDev · May 29, 2014 · 5e198e6 · 5e198e6 · the-sane · Jun 24, 2014
1 parent 80622f6
commit 5e198e6
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/java/net/citizensnpcs/npc/entity/HumanController.java b/src/main/java/net/citizensnpcs/npc/entity/HumanController.java
@@ -23,6 +23,7 @@
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.ChatColor;
 import org.bukkit.craftbukkit.v1_7_R3.CraftServer;
 import org.bukkit.craftbukkit.v1_7_R3.CraftWorld;
 import org.bukkit.entity.Entity;
@@ -77,7 +78,7 @@ private void updateSkin(final NPC npc, final WorldServer nmsWorld, GameProfile p
             skinUUID = npc.getName();
         }
         if (npc.data().has(CACHED_SKIN_UUID_METADATA) && npc.data().has(CACHED_SKIN_UUID_NAME_METADATA)
-                && skinUUID.equalsIgnoreCase(npc.data().<String> get(CACHED_SKIN_UUID_NAME_METADATA))) {
+                && ChatColor.stripColor(skinUUID).equalsIgnoreCase(ChatColor.stripColor(npc.data().<String> get(CACHED_SKIN_UUID_NAME_METADATA)))) {
             skinUUID = npc.data().get(CACHED_SKIN_UUID_METADATA);
         }
         if (UUID_CACHE.containsKey(skinUUID)) {
@@ -151,7 +152,7 @@ public String call() throws Exception {
             }
             final GameProfileRepository repo = ((CraftServer) Bukkit.getServer()).getServer()
                     .getGameProfileRepository();
-            repo.findProfilesByNames(new String[] { reportedUUID }, Agent.MINECRAFT, new ProfileLookupCallback() {
+            repo.findProfilesByNames(new String[] { ChatColor.stripColor(reportedUUID) }, Agent.MINECRAFT, new ProfileLookupCallback() {
                 @Override
                 public void onProfileLookupFailed(GameProfile arg0, Exception arg1) {
                     throw new RuntimeException(arg1);