Avoid impossible NPE.

Please, before complaining about this commit, realize that logic does not apply to arrow entities when Sentry is involved.
DenizenScript · Sep 28, 2013 · ee7bc96 · ee7bc96
1 parent b739009
commit ee7bc96
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
@@ -551,7 +551,7 @@ public boolean isGeneric() {
 
     public dLocation getLocation() {
 
-        if (!isGeneric()) {
+        if (isUnique() && entity != null) {
             return new dLocation(entity.getLocation());
         }
 

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
@@ -2322,6 +2322,9 @@ public void projectileHit(ProjectileHitEvent event) {
 
         dEntity projectile = new dEntity(event.getEntity());
 
+        if (projectile.getLocation() == null)
+            return; // No, I can't explain how or why this would ever happen... nonetheless, it appears it does happen sometimes.
+
         Block block = null;
         BlockIterator bi = new BlockIterator(projectile.getLocation().getWorld(), projectile.getLocation().toVector(), projectile.getLocation().getDirection().normalize(), 0, 4);
         while(bi.hasNext()) {