13
0
geforkt von Mirrors/Paper

SPIGOT-1405: Call EntityChangeBlockEvent for Rabbits eating Carrots

Dieser Commit ist enthalten in:
md_5 2016-06-30 16:15:38 +10:00
Ursprung 121dfc098a
Commit 8db0dbfc44

Datei anzeigen

@ -15,3 +15,27 @@
protected void r() {
this.goalSelector.a(1, new PathfinderGoalFloat(this));
@@ -412,9 +418,23 @@
Integer integer = (Integer) iblockdata.get(BlockCarrots.AGE);
if (integer.intValue() == 0) {
+ // CraftBukkit start
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.c, blockposition.getX(), blockposition.getY(), blockposition.getZ(), Blocks.AIR, 0).isCancelled()) {
+ return;
+ }
+ // CraftBukkit end
world.setTypeAndData(blockposition, Blocks.AIR.getBlockData(), 2);
world.setAir(blockposition, true);
} else {
+ // CraftBukkit start
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(
+ this.c,
+ blockposition.getX(), blockposition.getY(), blockposition.getZ(),
+ block, block.toLegacyData(iblockdata.set(BlockCarrots.AGE, Integer.valueOf(integer.intValue() - 1)))
+ ).isCancelled()) {
+ return;
+ }
+ // CraftBukkit end
world.setTypeAndData(blockposition, iblockdata.set(BlockCarrots.AGE, Integer.valueOf(integer.intValue() - 1)), 2);
world.triggerEffect(2001, blockposition, Block.getCombinedId(iblockdata));
}