From f4ef93493271d0d167afc4ef2d85a9e3d070b5e9 Mon Sep 17 00:00:00 2001 From: fullwall Date: Fri, 19 Jul 2019 01:14:52 +0800 Subject: [PATCH] Fix scoreboards, villager level --- .../main/java/net/citizensnpcs/trait/ScoreboardTrait.java | 6 +++--- .../net/citizensnpcs/nms/v1_14_R1/trait/VillagerTrait.java | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/main/src/main/java/net/citizensnpcs/trait/ScoreboardTrait.java b/main/src/main/java/net/citizensnpcs/trait/ScoreboardTrait.java index 5a3788311..30a346f45 100644 --- a/main/src/main/java/net/citizensnpcs/trait/ScoreboardTrait.java +++ b/main/src/main/java/net/citizensnpcs/trait/ScoreboardTrait.java @@ -31,13 +31,13 @@ public class ScoreboardTrait extends Trait { public void apply(Team team, boolean nameVisibility) { Set newTags = new HashSet(tags); - for (String oldTag : team.getEntries()) { + for (String oldTag : npc.getEntity().getScoreboardTags()) { if (!newTags.remove(oldTag)) { - team.removeEntry(oldTag); + npc.getEntity().removeScoreboardTag(oldTag); } } for (String tag : newTags) { - team.addEntry(tag); + npc.getEntity().addScoreboardTag(tag); } if (SUPPORT_TEAM_SETOPTION) { diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/trait/VillagerTrait.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/trait/VillagerTrait.java index 2a9c2ebf1..17c22cbc9 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/trait/VillagerTrait.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/trait/VillagerTrait.java @@ -9,7 +9,7 @@ import net.citizensnpcs.api.trait.TraitName; @TraitName("villagertrait") public class VillagerTrait extends Trait { @Persist - private int level; + private int level = 1; @Persist private Villager.Type type; @@ -24,6 +24,7 @@ public class VillagerTrait extends Trait { if (type != null) { ((Villager) npc.getEntity()).setVillagerType(type); } + level = Math.min(5, Math.max(1, level)); ((Villager) npc.getEntity()).setVillagerLevel(level); }