diff options
| author | EvilSeph <evilseph@gmail.com> | 2013-08-01 21:56:29 -0400 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2013-08-02 19:21:35 -0400 |
| commit | 720a8d706afcc2a099cbfed7ff42e34977199738 (patch) | |
| tree | 785060a9b7d9857662b66c26c225a50d1d03f2a9 /src/main/java/net/minecraft | |
| parent | a466e0aa6c0e1352fc69b9520c6b70129b11e018 (diff) | |
| download | craftbukkit-720a8d706afcc2a099cbfed7ff42e34977199738.tar craftbukkit-720a8d706afcc2a099cbfed7ff42e34977199738.tar.gz craftbukkit-720a8d706afcc2a099cbfed7ff42e34977199738.tar.lz craftbukkit-720a8d706afcc2a099cbfed7ff42e34977199738.tar.xz craftbukkit-720a8d706afcc2a099cbfed7ff42e34977199738.zip | |
Revert to 1.5 despawning behaviour for Ocelots and Wolves. Fixes BUKKIT-4449
Diffstat (limited to 'src/main/java/net/minecraft')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityInsentient.java | 9 | ||||
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityOcelot.java | 2 | ||||
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityWolf.java | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java index 12d47daf..34eb8725 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -377,8 +377,9 @@ public abstract class EntityInsentient extends EntityLiving { } protected void bo() { - // CraftBukkit - temporary hack to handle Ocelot despawning - if ((this instanceof EntityOcelot && this.isTypeNotPersistent()) || (!this.persistent)) { + if (this.persistent) { + this.aV = 0; + } else { EntityHuman entityhuman = this.world.findNearbyPlayer(this, -1.0D); if (entityhuman != null) { @@ -397,11 +398,7 @@ public abstract class EntityInsentient extends EntityLiving { this.aV = 0; } } - // CraftBukkit start - } else { - this.aV = 0; } - // CraftBukkit end } protected void bh() { diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java index c4e85962..069408db 100644 --- a/src/main/java/net/minecraft/server/EntityOcelot.java +++ b/src/main/java/net/minecraft/server/EntityOcelot.java @@ -48,7 +48,7 @@ public class EntityOcelot extends EntityTameableAnimal { } protected boolean isTypeNotPersistent() { - return !this.isTamed() && this.ticksLived > 2400; + return !this.isTamed(); // CraftBukkit } public boolean be() { diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java index df22e837..9d7d4a71 100644 --- a/src/main/java/net/minecraft/server/EntityWolf.java +++ b/src/main/java/net/minecraft/server/EntityWolf.java @@ -339,7 +339,7 @@ public class EntityWolf extends EntityTameableAnimal { } protected boolean isTypeNotPersistent() { - return !this.isTamed() && this.ticksLived > 2400; + return !this.isTamed(); // CraftBukkit } public boolean a(EntityLiving entityliving, EntityLiving entityliving1) { |