Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-12-31 13:37:40 +01:00
Code Issues Projects Releases Wiki Activity

fix: hologram issues (#3195)

Browse Source 
* fix: force hologram entity names to be updated

* fix: possibly NPE

* fix: delay placeholder computing
This commit is contained in:
ZX夏夜之风 2024-12-03 21:33:31 +08:00 committed by GitHub
parent d068180179
commit cc17c48df3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main/src/main/java/net/citizensnpcs/trait/HologramTrait.java
View File

@ -533,7 +533,7 @@ public class HologramTrait extends Trait {
public void setText(String text) { public void setText(String text) {
this.text = text == null ? "" : text; this.text = text == null ? "" : text;
if (ITEM_MATCHER.matcher(text).find() && !(renderer instanceof ItemRenderer)) { if (ITEM_MATCHER.matcher(this.text).find() && !(renderer instanceof ItemRenderer)) {
renderer.destroy(); renderer.destroy();
mb = 0.21; mb = 0.21;
mt = 0.07; mt = 0.07;
@ -866,7 +866,13 @@ public class HologramTrait extends Trait {
this.text = raw; this.text = raw;
if (hologram == null) if (hologram == null)
return; return;
hologram.setName(Placeholders.replace(text, null, npc)); if (hologram.isSpawned()) {
final String updatedName = Placeholders.replace(text, null, npc);
final Entity hologramEntity = hologram.getEntity();
hologramEntity.setCustomName(null);
// Use underlying Bukkit API to suppress rename event
hologramEntity.setCustomName(updatedName);
}
if (!Placeholders.containsPlaceholders(text)) { if (!Placeholders.containsPlaceholders(text)) {
hologram.data().set(NPC.Metadata.NAMEPLATE_VISIBLE, Messaging.stripColor(text).length() > 0); hologram.data().set(NPC.Metadata.NAMEPLATE_VISIBLE, Messaging.stripColor(text).length() > 0);
} }