Fix NPE

DenizenScript · Sep 15, 2013 · 8ead434 · 8ead434
1 parent 9e70e4a
commit 8ead434
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
@@ -433,7 +433,7 @@ public boolean isProjectile() {
      */
 
     public dEntity getShooter() {
-        if (isProjectile() && hasShooter())
+        if (hasShooter())
             return new dEntity(getProjectile().getShooter());
         else
             return null;

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java
@@ -1471,7 +1471,7 @@ else if (damager.isPlayer()) {
 
             // If the damager is a projectile, add its shooter (which can be null)
             // to the context
-            else if (damager.isProjectile()) {
+            else if (damager.hasShooter()) {
                 dEntity shooter = damager.getShooter();
                 context.put("shooter", shooter.getDenizenObject());
             }