SPIGOT-1132: Duplicate Minecart interact event

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2016-06-30 13:26:22 +10:00
parent acd31bf4fb
commit d6f72f0b27

View File

@ -57,18 +57,3 @@
return itemstack;
}
@@ -75,6 +109,14 @@
d0 = 0.5D;
}
+ // CraftBukkit start - Minecarts
+ org.bukkit.event.player.PlayerInteractEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent(entityhuman, org.bukkit.event.block.Action.RIGHT_CLICK_BLOCK, blockposition, enumdirection, itemstack, enumhand);
+
+ if (event.isCancelled()) {
+ return EnumInteractionResult.PASS;
+ }
+ // CraftBukkit end
+
EntityMinecartAbstract entityminecartabstract = EntityMinecartAbstract.a(world, (double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.0625D + d0, (double) blockposition.getZ() + 0.5D, this.b);
if (itemstack.hasName()) {