diff --git a/CraftBukkit-Patches/0061-Properly-Consume-Bonemeal-in-Dispensers.patch b/CraftBukkit-Patches/0061-Properly-Consume-Bonemeal-in-Dispensers.patch new file mode 100644 index 0000000000..9a048bbfe3 --- /dev/null +++ b/CraftBukkit-Patches/0061-Properly-Consume-Bonemeal-in-Dispensers.patch @@ -0,0 +1,47 @@ +From a7f87f9a78885b04014e5d6685f386b6838bdf7d Mon Sep 17 00:00:00 2001 +From: Alex Ciuba +Date: Mon, 10 Jun 2013 16:04:38 -0400 +Subject: [PATCH] Properly Consume Bonemeal in Dispensers + +Don't consume bonemeal if there is no crop in front. Fixes BUKKIT-3790 + +diff --git a/src/main/java/net/minecraft/server/DispenseBehaviorBonemeal.java b/src/main/java/net/minecraft/server/DispenseBehaviorBonemeal.java +index 1a58814..b83a803 100644 +--- a/src/main/java/net/minecraft/server/DispenseBehaviorBonemeal.java ++++ b/src/main/java/net/minecraft/server/DispenseBehaviorBonemeal.java +@@ -20,9 +20,8 @@ final class DispenseBehaviorBonemeal extends DispenseBehaviorItem { + int k = isourceblock.getBlockZ() + enumfacing.e(); + + // CraftBukkit start +- ItemStack itemstack1 = itemstack.a(1); + org.bukkit.block.Block block = world.getWorld().getBlockAt(isourceblock.getBlockX(), isourceblock.getBlockY(), isourceblock.getBlockZ()); +- CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1); ++ CraftItemStack craftItem = CraftItemStack.asNewCraftStack(itemstack.getItem()); + + BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(0, 0, 0)); + if (!BlockDispenser.eventFired) { +@@ -30,12 +29,10 @@ final class DispenseBehaviorBonemeal extends DispenseBehaviorItem { + } + + if (event.isCancelled()) { +- itemstack.count++; + return itemstack; + } + + if (!event.getItem().equals(craftItem)) { +- itemstack.count++; + // Chain to handler for new item + ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem()); + IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.a.a(eventStack.getItem()); +@@ -46,7 +43,7 @@ final class DispenseBehaviorBonemeal extends DispenseBehaviorItem { + } + // CraftBukkit end + +- if (ItemDye.a(itemstack1, world, i, j, k)) { // CraftBukkit - itemstack -> itemstack1 ++ if (ItemDye.a(itemstack, world, i, j, k)) { + if (!world.isStatic) { + world.triggerEffect(2005, i, j, k, 0); + } +-- +1.8.1.2 +