diff options
Diffstat (limited to 'nms-patches/PathfinderGoalTame.patch')
| -rw-r--r-- | nms-patches/PathfinderGoalTame.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nms-patches/PathfinderGoalTame.patch b/nms-patches/PathfinderGoalTame.patch index 26cc5c14..54fc0b56 100644 --- a/nms-patches/PathfinderGoalTame.patch +++ b/nms-patches/PathfinderGoalTame.patch @@ -1,12 +1,12 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/PathfinderGoalTame.java 2014-11-28 17:43:43.313707430 +0000 -+++ src/main/java/net/minecraft/server/PathfinderGoalTame.java 2014-11-28 17:38:21.000000000 +0000 +--- /home/matt/mc-dev-private//net/minecraft/server/PathfinderGoalTame.java 2015-02-26 22:40:22.975608135 +0000 ++++ src/main/java/net/minecraft/server/PathfinderGoalTame.java 2015-02-26 22:40:22.975608135 +0000 @@ -45,7 +45,8 @@ int i = this.entity.getTemper(); int j = this.entity.getMaxDomestication(); -- if (j > 0 && this.entity.bb().nextInt(j) < i) { +- if (j > 0 && this.entity.bc().nextInt(j) < i) { + // CraftBukkit - fire EntityTameEvent -+ if (j > 0 && this.entity.bb().nextInt(j) < i && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this.entity, (EntityHuman) this.entity.passenger).isCancelled() && this.entity.passenger instanceof EntityHuman) { ++ if (j > 0 && this.entity.bc().nextInt(j) < i && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this.entity, (EntityHuman) this.entity.passenger).isCancelled() && this.entity.passenger instanceof EntityHuman) { this.entity.h((EntityHuman) this.entity.passenger); this.entity.world.broadcastEntityEffect(this.entity, (byte) 7); return; @@ -26,6 +26,6 @@ + } + // this.entity.passenger = null; + // CraftBukkit end - this.entity.cU(); + this.entity.cW(); this.entity.world.broadcastEntityEffect(this.entity, (byte) 6); } |