Make scoreboard trait iterate over NPCs from all registries

This commit is contained in:
fullwall 2024-07-20 00:45:40 +08:00
parent 155d9c9730
commit 219e016ee7

View File

@ -12,6 +12,7 @@ import org.bukkit.scoreboard.Team;
import org.bukkit.scoreboard.Team.Option;
import org.bukkit.scoreboard.Team.OptionStatus;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
import net.citizensnpcs.Settings.Setting;
@ -40,7 +41,7 @@ public class ScoreboardTrait extends Trait {
public ScoreboardTrait() {
super("scoreboardtrait");
metadata = CitizensAPI.getLocationLookup().<Boolean> registerMetadata("scoreboard", (meta, event) -> {
for (NPC npc : CitizensAPI.getNPCRegistry()) {
for (NPC npc : Iterables.concat(CitizensAPI.getNPCRegistries())) {
ScoreboardTrait trait = npc.getTraitNullable(ScoreboardTrait.class);
if (trait == null)
continue;