summaryrefslogtreecommitdiffstats
path: root/nms-patches/PathfinderGoalEndermanPickupBlock.patch
diff options
context:
space:
mode:
authorThinkofdeath <thinkofdeath@spigotmc.org>2014-11-26 08:32:16 +1100
committermd_5 <git@md-5.net>2014-11-28 17:16:30 +1100
commit24557bc2b37deb6a0edf497d547471832457b1dd (patch)
treec560572889a3b0b34964a0cddb35dc87fda3c914 /nms-patches/PathfinderGoalEndermanPickupBlock.patch
parenta4805dbd77da057cc1ea0bf344379bc6e53ca1f6 (diff)
downloadcraftbukkit-24557bc2b37deb6a0edf497d547471832457b1dd.tar
craftbukkit-24557bc2b37deb6a0edf497d547471832457b1dd.tar.gz
craftbukkit-24557bc2b37deb6a0edf497d547471832457b1dd.tar.lz
craftbukkit-24557bc2b37deb6a0edf497d547471832457b1dd.tar.xz
craftbukkit-24557bc2b37deb6a0edf497d547471832457b1dd.zip
Update to Minecraft 1.8
For more information please see http://www.spigotmc.org/
Diffstat (limited to 'nms-patches/PathfinderGoalEndermanPickupBlock.patch')
-rw-r--r--nms-patches/PathfinderGoalEndermanPickupBlock.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/nms-patches/PathfinderGoalEndermanPickupBlock.patch b/nms-patches/PathfinderGoalEndermanPickupBlock.patch
new file mode 100644
index 00000000..31b450c1
--- /dev/null
+++ b/nms-patches/PathfinderGoalEndermanPickupBlock.patch
@@ -0,0 +1,17 @@
+--- ../work/decompile-bb26c12b/net/minecraft/server/PathfinderGoalEndermanPickupBlock.java 2014-11-27 08:59:46.825421301 +1100
++++ src/main/java/net/minecraft/server/PathfinderGoalEndermanPickupBlock.java 2014-11-27 08:42:10.164850887 +1100
+@@ -25,8 +25,12 @@
+ Block block = iblockdata.getBlock();
+
+ if (EntityEnderman.co().contains(block)) {
+- this.enderman.setCarried(iblockdata);
+- world.setTypeUpdate(blockposition, Blocks.AIR.getBlockData());
++ // CraftBukkit start - Pickup event
++ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.enderman, this.enderman.world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()), org.bukkit.Material.AIR).isCancelled()) {
++ this.enderman.setCarried(iblockdata);
++ world.setTypeUpdate(blockposition, Blocks.AIR.getBlockData());
++ }
++ // CraftBukkit end
+ }
+
+ }