Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Better default skin name detection

This commit is contained in:
fullwall 2020-04-18 12:31:27 +08:00
parent aaa6397a69
commit b546afa368
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/src/main/java/net/citizensnpcs/npc/skin/Skin.java
View File

@ -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;
}