Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-18 21:32:48 +01:00
Code Issues Projects Releases Wiki Activity

Fix more NPEs

Browse Source
This commit is contained in:
fullwall 2014-06-29 20:31:45 -07:00
parent 94340f15ff
commit d5162464bd
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/citizensnpcs/trait/NPCScoreboard.java
View File

@ -76,7 +76,7 @@ public class NPCScoreboard extends Trait {
objectives.add(objective);
}
Team playerTeam = objectives.iterator().next().getScoreboard().getPlayerTeam((Player) npc.getEntity());
if (team == null) {
if (team == null && playerTeam != null) {
team = playerTeam.getName();
}
if (scoreboard == null) {
@ -100,7 +100,10 @@ public class NPCScoreboard extends Trait {
}
}
if (npc.getEntity() instanceof Player && team == null) {
team = objectives.iterator().next().getScoreboard().getPlayerTeam((Player) npc.getEntity()).getName();
Team playerTeam = objectives.iterator().next().getScoreboard().getPlayerTeam((Player) npc.getEntity());
if (playerTeam != null) {
team = playerTeam.getName();
}
}
if (team != null) {
root.setString("team", team);