fix ban info stuff

DenizenScript · Jul 5, 2016 · 1cb442e · 1cb442e
1 parent a3d7f91
commit 1cb442e
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
@@ -1276,16 +1276,17 @@ else if (ban.getExpiration() == null) {
             if (ban == null) {
                 return null;
             }
-            else if (ban.getExpiration().before(new Date())) {
+            else if (ban.getExpiration() != null && ban.getExpiration().before(new Date())) {
                 return null;
             }
             // <--[tag]
             // @attribute <p@player.ban_info.expiration>
             // @returns Duration
             // @description
             // Returns the expiration of the player's ban, if they are banned.
+            // Potentially can be null.
             // -->
-            if (attribute.startsWith("expiration")) {
+            if (attribute.startsWith("expiration") && ban.getExpiration() != null) {
                 return new Duration(ban.getExpiration().getTime() / 50)
                         .getAttribute(attribute.fulfill(1));
             }