Catch NPE in dPlayer. rebuildAssignmentConstants() in assignment trai…

…t load.
DenizenScript · Jul 3, 2013 · 6e516cb · 6e516cb
1 parent 6834bd3
commit 6e516cb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/AssignmentTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/AssignmentTrait.java
@@ -42,6 +42,7 @@ public void load(DataKey key) throws NPCLoadException {
         if (hasAssignment())
             dB.echoError("Missing assignment '" + assignment + "' for NPC '"
                     + npc.getName() + "/" + npc.getId() + "! Perhaps the script has been removed?");
+        npc.getTrait(ConstantsTrait.class).rebuildAssignmentConstants();
     }
 
     /**

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java b/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java
@@ -29,6 +29,7 @@ public class dPlayer implements dObject {
     static Map<String, dPlayer> players = new HashMap<String, dPlayer>();
 
     public static dPlayer mirrorBukkitPlayer(Player player) {
+        if (player == null) return null;
         if (players.containsKey(player.getName())) return players.get(player.getName());
         else return new dPlayer(player);
     }