PaperMC/nms-patches/PathfinderGoalTame.patch

13 lines
744 B
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/PathfinderGoalTame.java
+++ b/net/minecraft/server/PathfinderGoalTame.java
2016-02-29 22:32:46 +01:00
@@ -51,7 +51,8 @@
int i = this.entity.getTemper();
int j = this.entity.getMaxDomestication();
2016-02-29 22:32:46 +01:00
- if (j > 0 && this.entity.getRandom().nextInt(j) < i) {
+ // CraftBukkit - fire EntityTameEvent
2016-02-29 22:32:46 +01:00
+ if (j > 0 && this.entity.getRandom().nextInt(j) < i && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this.entity, ((org.bukkit.craftbukkit.entity.CraftHumanEntity) this.entity.getBukkitEntity().getPassenger()).getHandle()).isCancelled()) {
2016-11-17 02:41:03 +01:00
this.entity.h((EntityHuman) entity);
return;
2016-11-17 02:41:03 +01:00
}