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

Fix /npc glowing --color

Browse Source
This commit is contained in:
fullwall 2019-07-12 14:48:10 +08:00
parent 0e328ee167
commit f767c2bbd1
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -403,10 +403,21 @@ public class CitizensNPC extends AbstractNPC {
} }
if (data().has(NPC.GLOWING_COLOR_METADATA)) { if (data().has(NPC.GLOWING_COLOR_METADATA)) {
if (team.getPrefix() == null || team.getPrefix().length() == 0 || (data().has("previous-glowing-color") if (SUPPORT_GLOWING_COLOR) {
&& !team.getPrefix().equals(data().get("previous-glowing-color")))) { try {
team.setPrefix(ChatColor.valueOf(data().<String> get(NPC.GLOWING_COLOR_METADATA)).toString()); if (team.getColor() == null || (data().has("previous-glowing-color")
data().set("previous-glowing-color", team.getPrefix()); && !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 @@ public class CitizensNPC extends AbstractNPC {
} }
private static final SetMultimap<ChunkCoord, NPC> CHUNK_LOADERS = HashMultimap.create(); private static final SetMultimap<ChunkCoord, NPC> CHUNK_LOADERS = HashMultimap.create();
private static final String NPC_METADATA_MARKER = "NPC"; private static final String NPC_METADATA_MARKER = "NPC";
private static boolean SUPPORT_GLOWING = true; private static boolean SUPPORT_GLOWING = true;
private static boolean SUPPORT_GLOWING_COLOR = true;
private static boolean SUPPORT_SILENT = true; private static boolean SUPPORT_SILENT = true;
private static boolean SUPPORT_TEAM_SETOPTION = true; private static boolean SUPPORT_TEAM_SETOPTION = true;
} }