From b546afa3682a25dd855d22be0e69e5c393327878 Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Sat, 18 Apr 2020 12:31:27 +0800
Subject: [PATCH] Better default skin name detection

---
 main/src/main/java/net/citizensnpcs/npc/skin/Skin.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/main/src/main/java/net/citizensnpcs/npc/skin/Skin.java b/main/src/main/java/net/citizensnpcs/npc/skin/Skin.java
index 9199a99c9..7695dde5b 100644
--- a/main/src/main/java/net/citizensnpcs/npc/skin/Skin.java
+++ b/main/src/main/java/net/citizensnpcs/npc/skin/Skin.java
@@ -10,6 +10,7 @@ import java.util.WeakHashMap;
 import javax.annotation.Nullable;
 
 import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.scheduler.BukkitTask;
 
 import com.google.common.base.Preconditions;
@@ -101,7 +102,9 @@ public class Skin {
         }
 
         if (!hasSkinData()) {
-            if (npc.hasTrait(SkinTrait.class) && !this.skinName.equals(cachedName)
+            String defaultSkinName = ChatColor.stripColor(npc.getName()).toLowerCase();
+
+            if (npc.hasTrait(SkinTrait.class) && this.skinName.equals(defaultSkinName)
                     && !npc.getTrait(SkinTrait.class).fetchDefaultSkin()) {
                 return false;
             }