Possibly fix entity data bug

DenizenScript · Jul 11, 2015 · b28d02e · b28d02e
1 parent 00d9c11
commit b28d02e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityShootsBowEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityShootsBowEvent.java
@@ -73,7 +73,7 @@ public boolean matches(ScriptContainer scriptContainer, String s) {
             return false;
         }
 
-        if (!item.equals("bow") && !tryItem(bow, item)){
+        if (!item.equals("bow") && !tryItem(bow, item)) {
             return false;
         }
 

diff --git a/src/main/java/net/aufdemrand/denizen/utilities/world/DenizenWorldAccess.java b/src/main/java/net/aufdemrand/denizen/utilities/world/DenizenWorldAccess.java
@@ -11,6 +11,7 @@
 import net.minecraft.server.v1_8_R3.Entity;
 import net.minecraft.server.v1_8_R3.EntityHuman;
 import net.minecraft.server.v1_8_R3.IWorldAccess;
+import org.bukkit.entity.LivingEntity;
 
 public class DenizenWorldAccess implements IWorldAccess {
     @Override
@@ -48,6 +49,9 @@ public void b(Entity entity) {
             if (Depends.citizens != null && CitizensAPI.getNPCRegistry().isNPC(entity.getBukkitEntity())) {
                 return;
             }
+            if (entity.getBukkitEntity() instanceof LivingEntity && !((LivingEntity) entity.getBukkitEntity()).getRemoveWhenFarAway()) {
+                return;
+            }
             EntityDespawnScriptEvent.instance.entity = new dEntity(entity.getBukkitEntity());
             EntityDespawnScriptEvent.instance.cause = new Element("OTHER");
             EntityDespawnScriptEvent.instance.cancelled = false;