Fix /npc glowing --color

CitizensDev · Jul 12, 2019 · f767c2b · f767c2b
1 parent 0e328ee
commit f767c2b
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
@@ -403,10 +403,21 @@ private void updateCustomName() {
         }
 
         if (data().has(NPC.GLOWING_COLOR_METADATA)) {
-            if (team.getPrefix() == null || team.getPrefix().length() == 0 || (data().has("previous-glowing-color")
-                    && !team.getPrefix().equals(data().get("previous-glowing-color")))) {
-                team.setPrefix(ChatColor.valueOf(data().<String> get(NPC.GLOWING_COLOR_METADATA)).toString());
-                data().set("previous-glowing-color", team.getPrefix());
+            if (SUPPORT_GLOWING_COLOR) {
+                try {
+                    if (team.getColor() == null || (data().has("previous-glowing-color")
+                            && !team.getColor().name().equals(data().get("previous-glowing-color")))) {
+                        team.setColor(ChatColor.valueOf(data().<String> get(NPC.GLOWING_COLOR_METADATA)));
+                    }
+                } catch (NoSuchMethodError err) {
+                    SUPPORT_GLOWING_COLOR = false;
+                }
+            } else {
+                if (team.getPrefix() == null || team.getPrefix().length() == 0 || (data().has("previous-glowing-color")
+                        && !team.getPrefix().equals(data().get("previous-glowing-color")))) {
+                    team.setPrefix(ChatColor.valueOf(data().<String> get(NPC.GLOWING_COLOR_METADATA)).toString());
+                    data().set("previous-glowing-color", team.getPrefix());
+                }
             }
         }
     }
@@ -421,8 +432,10 @@ private void updateFlyableState() {
     }
 
     private static final SetMultimap<ChunkCoord, NPC> CHUNK_LOADERS = HashMultimap.create();
+
     private static final String NPC_METADATA_MARKER = "NPC";
     private static boolean SUPPORT_GLOWING = true;
+    private static boolean SUPPORT_GLOWING_COLOR = true;
     private static boolean SUPPORT_SILENT = true;
     private static boolean SUPPORT_TEAM_SETOPTION = true;
 }