Upstream/LibsDisguises
1
0
Fork 1
mirror of https://github.com/libraryaddict/LibsDisguises.git synced 2025-02-21 02:31:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change the order of where the name is set

Browse Source
This commit is contained in:
libraryaddict 2022-07-25 04:49:28 +12:00
parent 298ffa0c99
commit 4fb298a33a
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java
View File

@ -988,6 +988,22 @@ public abstract class Disguise {
return false;
}
if (isDynamicName()) {
String name;
if (getEntity() instanceof Player) {
name = DisguiseUtilities.translateAlternateColorCodes(DisguiseUtilities.getDisplayName(getEntity()));
} else {
name = getEntity().getCustomName();
}
if (name == null) {
name = "";
}
getWatcher().setCustomName(name);
}
disguiseInUse = true;
if (!DisguiseUtilities.isInvalidFile()) {
@ -1059,22 +1075,6 @@ public abstract class Disguise {
setExpires(DisguiseConfig.isDynamicExpiry() ? 240 * 20 : System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(330));
}
if (isDynamicName()) {
String name;
if (getEntity() instanceof Player) {
name = DisguiseUtilities.translateAlternateColorCodes(DisguiseUtilities.getDisplayName(getEntity()));
} else {
name = getEntity().getCustomName();
}
if (name == null) {
name = "";
}
getWatcher().setCustomName(name);
}
makeBossBar();
return true;