summaryrefslogtreecommitdiffstats
path: root/nms-patches/PathfinderGoalMakeLove.patch
diff options
context:
space:
mode:
authorRyan Michela <deltahat@gmail.com>2016-06-18 22:00:39 -0700
committermd_5 <git@md-5.net>2016-06-19 20:14:09 +1000
commit9af379fc4741a6fb487aaf4b5c7ffdbcbb12ca4f (patch)
treef7bc7c89fd3ba17c6e6ecea676df2fd5a71b9437 /nms-patches/PathfinderGoalMakeLove.patch
parent63839165bc6923006d7a92b9b1fc5abc88dd9dfe (diff)
downloadcraftbukkit-9af379fc4741a6fb487aaf4b5c7ffdbcbb12ca4f.tar
craftbukkit-9af379fc4741a6fb487aaf4b5c7ffdbcbb12ca4f.tar.gz
craftbukkit-9af379fc4741a6fb487aaf4b5c7ffdbcbb12ca4f.tar.lz
craftbukkit-9af379fc4741a6fb487aaf4b5c7ffdbcbb12ca4f.tar.xz
craftbukkit-9af379fc4741a6fb487aaf4b5c7ffdbcbb12ca4f.zip
SPIGOT-1319: Add EntityBreedEvent
Diffstat (limited to 'nms-patches/PathfinderGoalMakeLove.patch')
-rw-r--r--nms-patches/PathfinderGoalMakeLove.patch14
1 files changed, 13 insertions, 1 deletions
diff --git a/nms-patches/PathfinderGoalMakeLove.patch b/nms-patches/PathfinderGoalMakeLove.patch
index 400761c0..d7269cd0 100644
--- a/nms-patches/PathfinderGoalMakeLove.patch
+++ b/nms-patches/PathfinderGoalMakeLove.patch
@@ -1,6 +1,18 @@
--- a/net/minecraft/server/PathfinderGoalMakeLove.java
+++ b/net/minecraft/server/PathfinderGoalMakeLove.java
-@@ -87,7 +87,7 @@
+@@ -80,6 +80,11 @@
+
+ private void i() {
+ EntityVillager entityvillager = this.b.b((EntityAgeable) this.c);
++ // CraftBukkit start - call EntityBreedEvent
++ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityBreedEvent(entityvillager, this.b, this.c, null, null, 0).isCancelled()) {
++ return;
++ }
++ // CraftBukkit end
+
+ this.c.setAgeRaw(6000);
+ this.b.setAgeRaw(6000);
+@@ -87,7 +92,7 @@
this.b.s(false);
entityvillager.setAgeRaw(-24000);
entityvillager.setPositionRotation(this.b.locX, this.b.locY, this.b.locZ, 0.0F, 0.0F);