Check if NPC and Player are valid before allowing tags to continue.

DenizenScript · Jul 2, 2013 · 82a5161 · 82a5161
1 parent 165fc99
commit 82a5161
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/NPCTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/NPCTags.java
@@ -49,6 +49,13 @@ public void npcTags(ReplaceableTagEvent event) {
                 return;
             }
 
+
+        if (n == null || !n.isValid()) {
+            dB.echoDebug("Invalid or missing player for tag <" + event.raw_tag + ">!");
+            event.setReplaced("null");
+            return;
+        }
+
         event.setReplaced(n.getAttribute(attribute.fulfill(1)));
 
     }

diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/PlayerTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/PlayerTags.java
@@ -80,6 +80,12 @@ public void playerTags(ReplaceableTagEvent event) {
                 return;
             }
 
+        if (p == null || !p.isValid()) {
+            dB.echoDebug("Invalid or missing player for tag <" + event.raw_tag + ">!");
+            event.setReplaced("null");
+            return;
+        }
+
         event.setReplaced(p.getAttribute(attribute.fulfill(1)));
     }