1 files changed, 30 insertions, 0 deletions
diff --git a/nms-patches/EntityOcelot.patch b/nms-patches/EntityOcelot.patch
new file mode 100644
index 00000000..1abf343c
--- /dev/null
+++ b/nms-patches/EntityOcelot.patch
@@ -0,0 +1,30 @@
+--- ../work/decompile-bb26c12b/net/minecraft/server/EntityOcelot.java	2014-11-27 08:59:46.713421793 +1100
++++ src/main/java/net/minecraft/server/EntityOcelot.java	2014-11-27 08:42:10.160850895 +1100
+@@ -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
+             }
+         }
+