Always consume bonemeal when used on a sapling. Fixes BUKKIT-3755

In Minecraft 1.5 saplings do not grow with a single use of bonemeal anymore.
Our code assumes they will and only takes away bonemeal from the player
when the tree grows successfully (not cancelled by a plugin). Instead we
now always remove a bonemeal even if a plugin is the reason a tree didn't
grow as this matches the vanilla logic more closely.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/main/java/net/minecraft/server/ItemDye.java b/src/main/java/net/minecraft/server/ItemDye.java
index 6e05654e..4f3b46ad 100644
--- a/src/main/java/net/minecraft/server/ItemDye.java
+++ b/src/main/java/net/minecraft/server/ItemDye.java
@@ -95,11 +95,11 @@ public class ItemDye extends Item {
                 if ((double) world.random.nextFloat() < 0.45D) {
                     // CraftBukkit start
                     Player player = (entityhuman instanceof EntityPlayer) ? (Player) entityhuman.getBukkitEntity() : null;
-                    ((BlockSapling) Block.SAPLING).grow(world, i, j, k, world.random, true, player, itemstack);
+                    ((BlockSapling) Block.SAPLING).grow(world, i, j, k, world.random, true, player, null);
+                    // CraftBukkit end
                 }
 
-                // --itemstack.count; - called later if the bonemeal attempt was succesful
-                // CraftBukkit end
+                --itemstack.count;
             }
 
             return true;
@@ -194,7 +194,7 @@ public class ItemDye extends Item {
                         ((BlockMushroom) Block.byId[l]).grow(world, i, j, k, world.random, true, player, itemstack);
                 }
 
-                //--itemstack.count; - called later if the bonemeal attempt was succesful
+                //--itemstack.count; - called later if the bonemeal attempt was not cancelled by a plugin
                 // CraftBukkit end
             }