diff options
| author | EvilSeph <evilseph@gmail.com> | 2013-07-08 21:10:58 -0400 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2013-07-09 21:04:45 -0400 |
| commit | 9109bd7652bb93997d26026d57ece40df344691f (patch) | |
| tree | 14205a629cb4d895fb258b9d32c0eae131fe4124 /src/main/java | |
| parent | f6a0b1e4265544eaee4e4d4adb660812b01d6a06 (diff) | |
| download | craftbukkit-9109bd7652bb93997d26026d57ece40df344691f.tar craftbukkit-9109bd7652bb93997d26026d57ece40df344691f.tar.gz craftbukkit-9109bd7652bb93997d26026d57ece40df344691f.tar.lz craftbukkit-9109bd7652bb93997d26026d57ece40df344691f.tar.xz craftbukkit-9109bd7652bb93997d26026d57ece40df344691f.zip | |
Ocelots -> Ocelittle. Addresses BUKKIT-4449
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityInsentient.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java index 34eb8725..12d47daf 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -377,9 +377,8 @@ public abstract class EntityInsentient extends EntityLiving { } protected void bo() { - if (this.persistent) { - this.aV = 0; - } else { + // CraftBukkit - temporary hack to handle Ocelot despawning + if ((this instanceof EntityOcelot && this.isTypeNotPersistent()) || (!this.persistent)) { EntityHuman entityhuman = this.world.findNearbyPlayer(this, -1.0D); if (entityhuman != null) { @@ -398,7 +397,11 @@ public abstract class EntityInsentient extends EntityLiving { this.aV = 0; } } + // CraftBukkit start + } else { + this.aV = 0; } + // CraftBukkit end } protected void bh() { |