From d7c257e120996eab1eab7d2bc5a31749ccbe274a Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 8 Jul 2016 11:12:40 +1000
Subject: SPIGOT-2490: Villager farming event

---
 nms-patches/PathfinderGoalVillagerFarm.patch | 49 ++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 nms-patches/PathfinderGoalVillagerFarm.patch

(limited to 'nms-patches/PathfinderGoalVillagerFarm.patch')

diff --git a/nms-patches/PathfinderGoalVillagerFarm.patch b/nms-patches/PathfinderGoalVillagerFarm.patch
new file mode 100644
index 00000000..449a3a77
--- /dev/null
+++ b/nms-patches/PathfinderGoalVillagerFarm.patch
@@ -0,0 +1,49 @@
+--- a/net/minecraft/server/PathfinderGoalVillagerFarm.java
++++ b/net/minecraft/server/PathfinderGoalVillagerFarm.java
+@@ -48,7 +48,11 @@
+             Block block = iblockdata.getBlock();
+ 
+             if (this.f == 0 && block instanceof BlockCrops && ((BlockCrops) block).y(iblockdata)) {
+-                world.setAir(blockposition, true);
++                // CraftBukkit start
++                if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.c, blockposition, Blocks.AIR, 0).isCancelled()) {
++                    world.setAir(blockposition, true);
++                }
++                // CraftBukkit end
+             } else if (this.f == 1 && iblockdata.getMaterial() == Material.AIR) {
+                 InventorySubcontainer inventorysubcontainer = this.c.dj();
+ 
+@@ -57,19 +61,29 @@
+                     boolean flag = false;
+ 
+                     if (itemstack != null) {
++                        // CraftBukkit start
++                        Block planted = null;
++
+                         if (itemstack.getItem() == Items.WHEAT_SEEDS) {
+-                            world.setTypeAndData(blockposition, Blocks.WHEAT.getBlockData(), 3);
++                            planted = Blocks.WHEAT;
+                             flag = true;
+                         } else if (itemstack.getItem() == Items.POTATO) {
+-                            world.setTypeAndData(blockposition, Blocks.POTATOES.getBlockData(), 3);
++                            planted = Blocks.POTATOES;
+                             flag = true;
+                         } else if (itemstack.getItem() == Items.CARROT) {
+-                            world.setTypeAndData(blockposition, Blocks.CARROTS.getBlockData(), 3);
++                            planted = Blocks.CARROTS;
+                             flag = true;
+                         } else if (itemstack.getItem() == Items.BEETROOT_SEEDS) {
+-                            world.setTypeAndData(blockposition, Blocks.BEETROOT.getBlockData(), 3);
++                            planted = Blocks.BEETROOT;
+                             flag = true;
+                         }
++
++                        if (planted != null && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.c, blockposition, planted, 0).isCancelled()) {
++                            world.setTypeAndData(blockposition, planted.getBlockData(), 3);
++                        } else {
++                            flag = false;
++                        }
++                        // CraftBukkit end
+                     }
+ 
+                     if (flag) {
-- 
cgit v1.2.3