From 5f61739cb8d8937d6d835aecbb5a73affd5ab4c7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 30 Jun 2016 13:26:22 +1000 Subject: SPIGOT-1132: Duplicate Minecart interact event --- nms-patches/ItemMinecart.patch | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/nms-patches/ItemMinecart.patch b/nms-patches/ItemMinecart.patch index b3ecc5e0..92224671 100644 --- a/nms-patches/ItemMinecart.patch +++ b/nms-patches/ItemMinecart.patch @@ -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()) { -- cgit v1.2.3