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

Move scoreboard tags outside of team code

Browse Source
This commit is contained in:
fullwall 2024-08-25 03:11:32 +08:00
parent 3cd096f84d
commit 3c036f371f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
main/src/main/java/net/citizensnpcs/trait/ScoreboardTrait.java
View File

@ -148,6 +148,15 @@ public class ScoreboardTrait extends Trait {
}
public void update() {
if (SUPPORT_TAGS) {
try {
if (!npc.getEntity().getScoreboardTags().equals(tags)) {
tags = Sets.newHashSet(npc.getEntity().getScoreboardTags());
}
} catch (NoSuchMethodError e) {
SUPPORT_TAGS = false;
}
}
String forceVisible = npc.data().<Object> get(NPC.Metadata.NAMEPLATE_VISIBLE, true).toString();
boolean nameVisibility = !npc.requiresNameHologram()
&& (forceVisible.equals("true") || forceVisible.equals("hover"));
@ -169,15 +178,6 @@ public class ScoreboardTrait extends Trait {
? npc.getEntity().getName()
: npc.getUniqueId().toString();
}
if (SUPPORT_TAGS) {
try {
if (!npc.getEntity().getScoreboardTags().equals(tags)) {
tags = Sets.newHashSet(npc.getEntity().getScoreboardTags());
}
} catch (NoSuchMethodError e) {
SUPPORT_TAGS = false;
}
}
if (SUPPORT_TEAM_SETOPTION) {
try {
OptionStatus visibility = nameVisibility ? OptionStatus.ALWAYS : OptionStatus.NEVER;