From 80935e5c2bef9793388bf0e877d66ffc98c60d05 Mon Sep 17 00:00:00 2001 From: Alex Ciuba Date: Mon, 10 Jun 2013 16:04:38 -0400 Subject: [PATCH] Don't consume bonemeal if there is no crop present. Fixes BUKKIT-3790 Bonemeal dispense behavior already took care of decrementing the item stack, therefore we shouldn't manage the size manually. Pulled from PR #1172 --- .../net/minecraft/server/DispenseBehaviorBonemeal.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/minecraft/server/DispenseBehaviorBonemeal.java b/src/main/java/net/minecraft/server/DispenseBehaviorBonemeal.java index 713bbe80a4..92b3789f7e 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); }