Fix NPE in dPlayer's <…chat_history> when player hasn't chatted.

DenizenScript · Aug 18, 2013 · fd5d855 · fd5d855
1 parent 35ea625
commit fd5d855
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java b/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java
@@ -339,8 +339,9 @@ else if (attribute.startsWith("list.offline")) {
             int x = 1;
             if (attribute.hasContext(1) && aH.matchesInteger(attribute.getContext(1)))
                 x = attribute.getIntContext(1);
-
-            return new Element(PlayerTags.playerChatHistory.get(player_name).get(x - 1))
+            // No playerchathistory? Return null.
+            if (!PlayerTags.playerChatHistory.containsKey(player_name)) return "null";
+            else return new Element(PlayerTags.playerChatHistory.get(player_name).get(x - 1))
                     .getAttribute(attribute.fulfill(1));
         }