Prevent massive NPE chain

We should maybe have arg.matchesArgumentType ensure a valueOf won't return null?
DenizenScript · Sep 29, 2013 · 15e6111 · 15e6111
1 parent 4c75e58
commit 15e6111
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/TeleportCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/TeleportCommand.java
@@ -68,6 +68,9 @@ public void execute(final ScriptEntry scriptEntry) throws CommandExecutionExcept
         dB.report(getName(), aH.debugObj("location", location) +
                              aH.debugObj("entities", entities.toString()));
 
+        if (location == null)
+            return;
+
         for (dEntity entity : entities) {
             // Call a Bukkit event for compatibility with "on entity teleports"
             // world event and other plugins