OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-02 04:56:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert to 1.5 despawning behaviour for Ocelots and Wolves. Fixes BUKKIT-4449

Browse source
This commit is contained in:
EvilSeph 2013-08-01 21:56:29 -04:00
parent a466e0aa6c
commit 720a8d706a
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/net/minecraft/server/EntityInsentient.java
View file

@ -377,8 +377,9 @@ public abstract class EntityInsentient extends EntityLiving {
} }
protected void bo() { protected void bo() {
// CraftBukkit - temporary hack to handle Ocelot despawning if (this.persistent) {
if ((this instanceof EntityOcelot && this.isTypeNotPersistent()) || (!this.persistent)) { this.aV = 0;
} else {
EntityHuman entityhuman = this.world.findNearbyPlayer(this, -1.0D); EntityHuman entityhuman = this.world.findNearbyPlayer(this, -1.0D);
if (entityhuman != null) { if (entityhuman != null) {
@ -397,11 +398,7 @@ public abstract class EntityInsentient extends EntityLiving {
this.aV = 0; this.aV = 0;
} }
} }
// CraftBukkit start
} else {
this.aV = 0;
} }
// CraftBukkit end
} }
protected void bh() { protected void bh() {

2
src/main/java/net/minecraft/server/EntityOcelot.java
View file

@ -48,7 +48,7 @@ public class EntityOcelot extends EntityTameableAnimal {
} }
protected boolean isTypeNotPersistent() { protected boolean isTypeNotPersistent() {
return !this.isTamed() && this.ticksLived > 2400; return !this.isTamed(); // CraftBukkit
} }
public boolean be() { public boolean be() {

2
src/main/java/net/minecraft/server/EntityWolf.java
View file

@ -339,7 +339,7 @@ public class EntityWolf extends EntityTameableAnimal {
} }
protected boolean isTypeNotPersistent() { protected boolean isTypeNotPersistent() {
return !this.isTamed() && this.ticksLived > 2400; return !this.isTamed(); // CraftBukkit
} }
public boolean a(EntityLiving entityliving, EntityLiving entityliving1) { public boolean a(EntityLiving entityliving, EntityLiving entityliving1) {