Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-27 05:05:20 +01:00
Code Issues Projects Releases Wiki Activity

Fix blank names for a few seconds after spawning a npc. (#2477)

Browse Source
This commit is contained in:
mariaum 2021-02-22 08:27:06 -03:00 committed by GitHub
parent 6c26f98080
commit 0b41b24425
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
View File

@ -327,6 +327,7 @@ public class CitizensNPC extends AbstractNPC {
} }
updateFlyableState(); updateFlyableState();
updateCustomNameVisibility();
updateCustomName(); updateCustomName();
Messaging.debug("Spawned", getId(), "SpawnReason." + reason); Messaging.debug("Spawned", getId(), "SpawnReason." + reason);
@ -381,11 +382,7 @@ public class CitizensNPC extends AbstractNPC {
updateCounter = 0; updateCounter = 0;
} }
String nameplateVisible = data().<Object> get(NPC.NAMEPLATE_VISIBLE_METADATA, true).toString(); updateCustomNameVisibility();
if (requiresNameHologram()) {
nameplateVisible = "false";
}
getEntity().setCustomNameVisible(Boolean.parseBoolean(nameplateVisible));
if (isLiving) { if (isLiving) {
NMS.setKnockbackResistance((LivingEntity) getEntity(), NMS.setKnockbackResistance((LivingEntity) getEntity(),
@ -406,6 +403,14 @@ public class CitizensNPC extends AbstractNPC {
} }
} }
private void updateCustomNameVisibility() {
String nameplateVisible = data().<Object> get(NPC.NAMEPLATE_VISIBLE_METADATA, true).toString();
if (requiresNameHologram()) {
nameplateVisible = "false";
}
getEntity().setCustomNameVisible(Boolean.parseBoolean(nameplateVisible));
}
private void updateCustomName() { private void updateCustomName() {
boolean nameVisibility = false; boolean nameVisibility = false;
if (!getEntity().isCustomNameVisible() if (!getEntity().isCustomNameVisible()