2014-11-29 00:02:15 +01:00
|
|
|
--- ../work/decompile-8eb82bde//net/minecraft/server/EntityOcelot.java 2014-11-28 17:43:43.141707434 +0000
|
|
|
|
|
+++ src/main/java/net/minecraft/server/EntityOcelot.java 2014-11-28 17:38:21.000000000 +0000
|
2014-11-25 22:32:16 +01:00
|
|
|
@@ -51,7 +51,7 @@
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
protected boolean isTypeNotPersistent() {
|
|
|
|
|
- return !this.isTamed() && this.ticksLived > 2400;
|
|
|
|
|
+ return !this.isTamed() /*&& this.ticksLived > 2400*/; // CraftBukkit
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
protected void aW() {
|
|
|
|
|
@@ -124,7 +124,8 @@
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!this.world.isStatic) {
|
|
|
|
|
- if (this.random.nextInt(3) == 0) {
|
|
|
|
|
+ // CraftBukkit - added event call and isCancelled check
|
|
|
|
|
+ if (this.random.nextInt(3) == 0 && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this, entityhuman).isCancelled()) {
|
|
|
|
|
this.setTamed(true);
|
|
|
|
|
this.setCatType(1 + this.world.random.nextInt(3));
|
|
|
|
|
this.setOwnerUUID(entityhuman.getUniqueID().toString());
|
|
|
|
|
@@ -231,7 +232,7 @@
|
|
|
|
|
|
|
|
|
|
entityocelot.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
|
|
|
|
|
entityocelot.setAgeRaw(-24000);
|
|
|
|
|
- this.world.addEntity(entityocelot);
|
|
|
|
|
+ this.world.addEntity(entityocelot, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.OCELOT_BABY); // CraftBukkit - add SpawnReason
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
