summaryrefslogtreecommitdiffstats
path: root/nms-patches/EntityOcelot.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/EntityOcelot.patch')
-rw-r--r--nms-patches/EntityOcelot.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/nms-patches/EntityOcelot.patch b/nms-patches/EntityOcelot.patch
index 6574350a..ae02a4e6 100644
--- a/nms-patches/EntityOcelot.patch
+++ b/nms-patches/EntityOcelot.patch
@@ -34,10 +34,10 @@
- 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.c(entityhuman);
this.setCatType(1 + this.world.random.nextInt(3));
- this.setOwnerUUID(entityhuman.getUniqueID());
-@@ -238,7 +243,7 @@
+ this.p(true);
+@@ -237,7 +242,7 @@
entityocelot.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
entityocelot.setAgeRaw(-24000);