diff options
author | Travis Watkins <amaranth@ubuntu.com> | 2013-03-16 08:05:03 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2013-03-16 08:05:03 -0500 |
commit | 4fa8c24e421856bd6eae01137bafacfc8673d1c8 (patch) | |
tree | b404de9f6506d8916813b743ac9935a2909bd953 /src/main/java/net/minecraft/server/ItemDye.java | |
parent | d47849df8c4bee23ac85897a41537142ab81ab7b (diff) | |
download | craftbukkit-4fa8c24e421856bd6eae01137bafacfc8673d1c8.tar craftbukkit-4fa8c24e421856bd6eae01137bafacfc8673d1c8.tar.gz craftbukkit-4fa8c24e421856bd6eae01137bafacfc8673d1c8.tar.lz craftbukkit-4fa8c24e421856bd6eae01137bafacfc8673d1c8.tar.xz craftbukkit-4fa8c24e421856bd6eae01137bafacfc8673d1c8.zip |
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.
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemDye.java')
-rw-r--r-- | src/main/java/net/minecraft/server/ItemDye.java | 8 |
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 } |