Set NPC custom name to null when display name is empty.

FancyMcPlugins · Nov 14, 2024 · cdc11ca · cdc11ca
1 parent 0e8a2cb
commit cdc11ca
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 0 deletions.
diff --git a/implementation_1_19_4/src/main/java/de/oliver/fancynpcs/v1_19_4/Npc_1_19_4.java b/implementation_1_19_4/src/main/java/de/oliver/fancynpcs/v1_19_4/Npc_1_19_4.java
@@ -219,6 +219,8 @@ public void update(Player player) {
 
         if (data.getDisplayName().equalsIgnoreCase("<empty>")) {
             team.setNameTagVisibility(Team.Visibility.NEVER);
+            npc.setCustomName(null);
+            npc.setCustomNameVisible(false);
         } else {
             team.setNameTagVisibility(Team.Visibility.ALWAYS);
         }

diff --git a/implementation_1_20_1/src/main/java/de/oliver/fancynpcs/v1_20_1/Npc_1_20_1.java b/implementation_1_20_1/src/main/java/de/oliver/fancynpcs/v1_20_1/Npc_1_20_1.java
@@ -220,6 +220,8 @@ public void update(Player player) {
 
         if (data.getDisplayName().equalsIgnoreCase("<empty>")) {
             team.setNameTagVisibility(Team.Visibility.NEVER);
+            npc.setCustomName(null);
+            npc.setCustomNameVisible(false);
         } else {
             team.setNameTagVisibility(Team.Visibility.ALWAYS);
         }

diff --git a/implementation_1_20_2/src/main/java/de/oliver/fancynpcs/v1_20_2/Npc_1_20_2.java b/implementation_1_20_2/src/main/java/de/oliver/fancynpcs/v1_20_2/Npc_1_20_2.java
@@ -217,6 +217,8 @@ public void update(Player player) {
 
         if (data.getDisplayName().equalsIgnoreCase("<empty>")) {
             team.setNameTagVisibility(Team.Visibility.NEVER);
+            npc.setCustomName(null);
+            npc.setCustomNameVisible(false);
         } else {
             team.setNameTagVisibility(Team.Visibility.ALWAYS);
         }

diff --git a/implementation_1_20_4/src/main/java/de/oliver/fancynpcs/v1_20_4/Npc_1_20_4.java b/implementation_1_20_4/src/main/java/de/oliver/fancynpcs/v1_20_4/Npc_1_20_4.java
@@ -216,6 +216,8 @@ public void update(Player player) {
 
         if (data.getDisplayName().equalsIgnoreCase("<empty>")) {
             team.setNameTagVisibility(Team.Visibility.NEVER);
+            npc.setCustomName(null);
+            npc.setCustomNameVisible(false);
         } else {
             team.setNameTagVisibility(Team.Visibility.ALWAYS);
         }

diff --git a/implementation_1_20_6/src/main/java/de/oliver/fancynpcs/v1_20_6/Npc_1_20_6.java b/implementation_1_20_6/src/main/java/de/oliver/fancynpcs/v1_20_6/Npc_1_20_6.java
@@ -216,6 +216,8 @@ public void update(Player player) {
 
         if (data.getDisplayName().equalsIgnoreCase("<empty>")) {
             team.setNameTagVisibility(Team.Visibility.NEVER);
+            npc.setCustomName(null);
+            npc.setCustomNameVisible(false);
         } else {
             team.setNameTagVisibility(Team.Visibility.ALWAYS);
         }

diff --git a/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/Npc_1_21_1.java b/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/Npc_1_21_1.java
@@ -228,6 +228,8 @@ public void update(Player player) {
 
         if (data.getDisplayName().equalsIgnoreCase("<empty>")) {
             team.setNameTagVisibility(Team.Visibility.NEVER);
+            npc.setCustomName(null);
+            npc.setCustomNameVisible(false);
         } else {
             team.setNameTagVisibility(Team.Visibility.ALWAYS);
         }

diff --git a/implementation_1_21_3/src/main/java/de/oliver/fancynpcs/v1_21_3/Npc_1_21_3.java b/implementation_1_21_3/src/main/java/de/oliver/fancynpcs/v1_21_3/Npc_1_21_3.java
@@ -239,6 +239,8 @@ public void update(Player player) {
 
         if (data.getDisplayName().equalsIgnoreCase("<empty>")) {
             team.setNameTagVisibility(Team.Visibility.NEVER);
+            npc.setCustomName(null);
+            npc.setCustomNameVisible(false);
         } else {
             team.setNameTagVisibility(Team.Visibility.ALWAYS);
         }