diff options
author | md_5 <git@md-5.net> | 2016-06-30 13:26:22 +1000 |
---|---|---|
committer | md_5 <git@md-5.net> | 2016-06-30 13:26:22 +1000 |
commit | 5f61739cb8d8937d6d835aecbb5a73affd5ab4c7 (patch) | |
tree | 8cb035ef7958af60771d31e063dc0b416fd9482e | |
parent | 1fe19a83f9c0cf8a4fb4b51bdd85b583dda7df8c (diff) | |
download | craftbukkit-5f61739cb8d8937d6d835aecbb5a73affd5ab4c7.tar craftbukkit-5f61739cb8d8937d6d835aecbb5a73affd5ab4c7.tar.gz craftbukkit-5f61739cb8d8937d6d835aecbb5a73affd5ab4c7.tar.lz craftbukkit-5f61739cb8d8937d6d835aecbb5a73affd5ab4c7.tar.xz craftbukkit-5f61739cb8d8937d6d835aecbb5a73affd5ab4c7.zip |
SPIGOT-1132: Duplicate Minecart interact event
-rw-r--r-- | nms-patches/ItemMinecart.patch | 15 |
1 files changed, 0 insertions, 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()) { |