SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Deny setCustomNameVisible if overriden custom names

Browse Source
This commit is contained in:
libraryaddict 2020-05-11 17:58:32 +12:00
parent 7a4cb6b7f0
commit a018973eeb
No known key found for this signature in database
GPG Key ID: 052E4FBCD257AEA4
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java
View File

@ -359,16 +359,13 @@ public class FlagWatcher {
public void setCustomName(String name) { public void setCustomName(String name) {
if (!getDisguise().isPlayerDisguise() && DisguiseConfig.isArmorstandsName() && if (!getDisguise().isPlayerDisguise() && DisguiseConfig.isArmorstandsName() &&
DisguiseConfig.isOverrideCustomNames()) { DisguiseConfig.isOverrideCustomNames()) {
if (NmsVersion.v1_13.isSupported()) { MetaIndex custom =
if (!hasValue(MetaIndex.ENTITY_CUSTOM_NAME)) { NmsVersion.v1_13.isSupported() ? MetaIndex.ENTITY_CUSTOM_NAME : MetaIndex.ENTITY_CUSTOM_NAME_OLD;
setData(MetaIndex.ENTITY_CUSTOM_NAME, Optional.empty());
sendData(MetaIndex.ENTITY_CUSTOM_NAME); if (!hasValue(custom)) {
} setData(custom, custom.getDefault());
} else { sendData(MetaIndex.ENTITY_CUSTOM_NAME);
if (!hasValue(MetaIndex.ENTITY_CUSTOM_NAME_OLD)) { setCustomNameVisible(false);
setData(MetaIndex.ENTITY_CUSTOM_NAME_OLD, "");
sendData(MetaIndex.ENTITY_CUSTOM_NAME_OLD);
}
} }
if (Strings.isNullOrEmpty(name)) { if (Strings.isNullOrEmpty(name)) {
@ -483,6 +480,10 @@ public class FlagWatcher {
} }
public void setCustomNameVisible(boolean display) { public void setCustomNameVisible(boolean display) {
if (DisguiseConfig.isArmorstandsName() && DisguiseConfig.isOverrideCustomNames()) {
display = false;
}
setData(MetaIndex.ENTITY_CUSTOM_NAME_VISIBLE, display); setData(MetaIndex.ENTITY_CUSTOM_NAME_VISIBLE, display);
sendData(MetaIndex.ENTITY_CUSTOM_NAME_VISIBLE); sendData(MetaIndex.ENTITY_CUSTOM_NAME_VISIBLE);
} }