Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-12-23 09:37:35 +01:00
Code Issues Projects Releases Wiki Activity

Fix scoreboards, villager level

Browse Source
This commit is contained in:
fullwall 2019-07-19 01:14:52 +08:00
parent 68e9ca68b5
commit f4ef934932
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,13 +31,13 @@ public class ScoreboardTrait extends Trait {
public void apply(Team team, boolean nameVisibility) { public void apply(Team team, boolean nameVisibility) {
Set<String> newTags = new HashSet<String>(tags); Set<String> newTags = new HashSet<String>(tags);
for (String oldTag : team.getEntries()) { for (String oldTag : npc.getEntity().getScoreboardTags()) {
if (!newTags.remove(oldTag)) { if (!newTags.remove(oldTag)) {
team.removeEntry(oldTag); npc.getEntity().removeScoreboardTag(oldTag);
} }
} }
for (String tag : newTags) { for (String tag : newTags) {
team.addEntry(tag); npc.getEntity().addScoreboardTag(tag);
} }
if (SUPPORT_TEAM_SETOPTION) { if (SUPPORT_TEAM_SETOPTION) {

3
v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/trait/VillagerTrait.java
View File

@ -9,7 +9,7 @@ import net.citizensnpcs.api.trait.TraitName;
@TraitName("villagertrait") @TraitName("villagertrait")
public class VillagerTrait extends Trait { public class VillagerTrait extends Trait {
@Persist @Persist
private int level; private int level = 1;
@Persist @Persist
private Villager.Type type; private Villager.Type type;
@ -24,6 +24,7 @@ public class VillagerTrait extends Trait {
if (type != null) { if (type != null) {
((Villager) npc.getEntity()).setVillagerType(type); ((Villager) npc.getEntity()).setVillagerType(type);
} }
level = Math.min(5, Math.max(1, level));
((Villager) npc.getEntity()).setVillagerLevel(level); ((Villager) npc.getEntity()).setVillagerLevel(level);
} }