diff options
author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-02-26 22:41:06 +0000 |
---|---|---|
committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-03-04 09:48:58 +0000 |
commit | d8a9c7be4227b2243968b63ab7cc7a00098c93ad (patch) | |
tree | 554a08a5f23ffa5dd66a28247d6358515b1ffb7a /nms-patches/PathfinderGoalEndermanPickupBlock.patch | |
parent | 33d5de312e9fcc8aec3fc53136658cb6920562aa (diff) | |
download | craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.gz craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.lz craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.xz craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.zip |
Update to Minecraft 1.8.3
Diffstat (limited to 'nms-patches/PathfinderGoalEndermanPickupBlock.patch')
-rw-r--r-- | nms-patches/PathfinderGoalEndermanPickupBlock.patch | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/nms-patches/PathfinderGoalEndermanPickupBlock.patch b/nms-patches/PathfinderGoalEndermanPickupBlock.patch deleted file mode 100644 index 57133e42..00000000 --- a/nms-patches/PathfinderGoalEndermanPickupBlock.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/PathfinderGoalEndermanPickupBlock.java 2014-11-28 17:43:43.285707431 +0000 -+++ src/main/java/net/minecraft/server/PathfinderGoalEndermanPickupBlock.java 2014-11-28 17:38:23.000000000 +0000 -@@ -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 - } - - } |