Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix incorrect onDespawn usage leaking teams in ScoreboardTrait

This commit is contained in:
fullwall 2023-09-18 18:39:23 +08:00
parent 3e7b465a04
commit 7b650a2af4
1 changed files with 11 additions and 7 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

@ -22,7 +22,6 @@ import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.api.persistence.Persist; import net.citizensnpcs.api.persistence.Persist;
import net.citizensnpcs.api.trait.Trait; import net.citizensnpcs.api.trait.Trait;
import net.citizensnpcs.api.trait.TraitName; import net.citizensnpcs.api.trait.TraitName;
import net.citizensnpcs.api.util.Messaging;
import net.citizensnpcs.util.NMS; import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
@ -73,7 +72,6 @@ public class ScoreboardTrait extends Trait {
clearClientTeams(team); clearClientTeams(team);
} }
team.addEntry(entityName); team.addEntry(entityName);
Messaging.debug("Created team", teamName, "with entity", entityName);
} }
public ChatColor getColor() { public ChatColor getColor() {
@ -96,8 +94,16 @@ public class ScoreboardTrait extends Trait {
return; return;
Team team = Util.getDummyScoreboard().getTeam(teamName); Team team = Util.getDummyScoreboard().getTeam(teamName);
npc.data().remove(NPC.Metadata.SCOREBOARD_FAKE_TEAM_NAME); npc.data().remove(NPC.Metadata.SCOREBOARD_FAKE_TEAM_NAME);
if (team == null || name == null || !team.hasEntry(name)) if (team == null || name == null || !team.hasEntry(name)) {
try {
if (team != null && team.getSize() == 0) {
clearClientTeams(team);
team.unregister();
}
} catch (IllegalStateException ex) {
}
return; return;
}
Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> { Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
if (npc.isSpawned()) if (npc.isSpawned())
return; return;
@ -106,20 +112,18 @@ public class ScoreboardTrait extends Trait {
} catch (IllegalStateException ex) { } catch (IllegalStateException ex) {
return; return;
} }
if (team.getSize() == 1) { if (team.getSize() <= 1) {
clearClientTeams(team); clearClientTeams(team);
team.unregister(); team.unregister();
Messaging.debug("Removed team", teamName);
} else { } else {
team.removeEntry(name); team.removeEntry(name);
Messaging.debug("Removed team entry", name, "from", teamName);
} }
}, reason == DespawnReason.DEATH && npc.getEntity() instanceof LivingEntity ? 20 : 2); }, reason == DespawnReason.DEATH && npc.getEntity() instanceof LivingEntity ? 20 : 2);
} }
@Override @Override
public void onRemove() { public void onRemove() {
onDespawn(); onDespawn(DespawnReason.REMOVAL);
} }
@Override @Override