summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorfeildmaster <admin@feildmaster.com>2012-12-05 12:08:58 -0600
committerfeildmaster <admin@feildmaster.com>2012-12-05 12:28:09 -0600
commit09684ba9d758460806fa1e930410dc9079094a4d (patch)
treed52c33e966a62876553bc5ddab8339ddff5b0d4c /src
parentfb6d9e1808e7a9f392fecd5ff15638069edf7248 (diff)
downloadcraftbukkit-09684ba9d758460806fa1e930410dc9079094a4d.tar
craftbukkit-09684ba9d758460806fa1e930410dc9079094a4d.tar.gz
craftbukkit-09684ba9d758460806fa1e930410dc9079094a4d.tar.lz
craftbukkit-09684ba9d758460806fa1e930410dc9079094a4d.tar.xz
craftbukkit-09684ba9d758460806fa1e930410dc9079094a4d.zip
Persistence isn't just animals. Fix BUKKIT-3105
Also set to this value if the persistence hasn't been updated
Diffstat (limited to 'src')
-rw-r--r--src/main/java/net/minecraft/server/EntityLiving.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index b709cb60..ba9721c4 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;
- public boolean persistent = (this instanceof EntityAnimal); // CraftBukkit - private -> public, change value
+ public boolean persistent = !this.bj(); // CraftBukkit - private -> public, change value
protected int bs;
protected double bt;
protected double bu;
@@ -1139,6 +1139,8 @@ public abstract class EntityLiving extends Entity {
boolean data = nbttagcompound.getBoolean("PersistenceRequired");
if (nbttagcompound.hasKey("Bukkit.PersistenceUpdated") || data) {
this.persistent = data;
+ } else {
+ this.persistent = !this.bj();
}
// CraftBukkit end