mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 14:33:56 +01:00
90ac03522a
This reverts commit d6e3dff7d8
.
18 lines
997 B
Diff
18 lines
997 B
Diff
--- ../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
|
|
}
|
|
|
|
}
|