From 4dadf0e2b5ecb7a2644e2feb71e3a7ab1194ec84 Mon Sep 17 00:00:00 2001 From: Travis Watkins Date: Tue, 4 Dec 2012 18:33:44 -0600 Subject: [PATCH] Implement API for mob despawn when away from players. Adds BUKKIT-2986 As of 1.4 mobs have a flag to determine if they despawn when away from a player or not. Unfortunately animals still use their own system to prevent despawning instead of making use of this flag. This change modifies them to use the new system (defaults to true) and to add API for plugins to adjust this. --- src/main/java/net/minecraft/server/EntityLiving.java | 6 +++--- .../org/bukkit/craftbukkit/entity/CraftLivingEntity.java | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java index 362e3b396f..fff17a2da9 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -87,7 +87,7 @@ public abstract class EntityLiving extends Entity { public boolean bp = false; public int bq = 0; protected boolean canPickUpLoot = false; - private boolean persistent = false; + public boolean persistent = (this instanceof EntityAnimal); // CraftBukkit - private -> public, change value protected int bs; protected double bt; protected double bu; @@ -1394,11 +1394,11 @@ public abstract class EntityLiving extends Entity { double d2 = entityhuman.locZ - this.locZ; double d3 = d0 * d0 + d1 * d1 + d2 * d2; - if (this.bj() && d3 > 16384.0D) { + if (d3 > 16384.0D) { // CraftBukkit - remove this.bj() check this.die(); } - if (this.bA > 600 && this.random.nextInt(800) == 0 && d3 > 1024.0D && this.bj()) { + if (this.bA > 600 && this.random.nextInt(800) == 0 && d3 > 1024.0D) { // CraftBukkit - remove this.bj() check this.die(); } else if (d3 < 1024.0D) { this.bA = 0; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java index 096de37378..a6cbc3d71f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -303,4 +303,12 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { public boolean hasLineOfSight(Entity other) { return getHandle().aA().canSee(((CraftEntity) other).getHandle()); // az should be getEntitySenses } + + public boolean getRemoveWhenFarAway() { + return !getHandle().persistent; + } + + public void setRemoveWhenFarAway(boolean remove) { + getHandle().persistent = !remove; + } }