summaryrefslogtreecommitdiffstats
path: root/src/main/java/net
diff options
context:
space:
mode:
authorTravis Watkins <amaranth@ubuntu.com>2012-12-04 18:33:44 -0600
committerTravis Watkins <amaranth@ubuntu.com>2012-12-04 20:10:23 -0600
commit4dadf0e2b5ecb7a2644e2feb71e3a7ab1194ec84 (patch)
treefc546653d44e31e997b7bfb537e33793eea5ce82 /src/main/java/net
parent11894784b06fa8559864932f46582e24c96bf45c (diff)
downloadcraftbukkit-4dadf0e2b5ecb7a2644e2feb71e3a7ab1194ec84.tar
craftbukkit-4dadf0e2b5ecb7a2644e2feb71e3a7ab1194ec84.tar.gz
craftbukkit-4dadf0e2b5ecb7a2644e2feb71e3a7ab1194ec84.tar.lz
craftbukkit-4dadf0e2b5ecb7a2644e2feb71e3a7ab1194ec84.tar.xz
craftbukkit-4dadf0e2b5ecb7a2644e2feb71e3a7ab1194ec84.zip
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.
Diffstat (limited to 'src/main/java/net')
-rw-r--r--src/main/java/net/minecraft/server/EntityLiving.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 362e3b39..fff17a2d 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;