diff options
author | Nathan Adams <dinnerbone@dinnerbone.com> | 2011-12-19 16:41:55 +0000 |
---|---|---|
committer | Nathan Adams <dinnerbone@dinnerbone.com> | 2011-12-19 16:41:55 +0000 |
commit | 972b2087f202d1b8ebe4195ee83e967f45241b82 (patch) | |
tree | 0ea6040ee0186fd21e88320a27b112cf8d7b1d8a /src/main/java/net/minecraft/server/BlockMushroom.java | |
parent | 246d07482bf1bc3a6545e06aae19bd42f5da2a46 (diff) | |
download | craftbukkit-972b2087f202d1b8ebe4195ee83e967f45241b82.tar craftbukkit-972b2087f202d1b8ebe4195ee83e967f45241b82.tar.gz craftbukkit-972b2087f202d1b8ebe4195ee83e967f45241b82.tar.lz craftbukkit-972b2087f202d1b8ebe4195ee83e967f45241b82.tar.xz craftbukkit-972b2087f202d1b8ebe4195ee83e967f45241b82.zip |
Fixed bonemeal not being consumed on failed growth attempts. This fixes BUKKIT-337. Thanks to md-5 for the pull request!
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockMushroom.java')
-rw-r--r-- | src/main/java/net/minecraft/server/BlockMushroom.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/BlockMushroom.java b/src/main/java/net/minecraft/server/BlockMushroom.java index 3c6e662e..2d8cf25f 100644 --- a/src/main/java/net/minecraft/server/BlockMushroom.java +++ b/src/main/java/net/minecraft/server/BlockMushroom.java @@ -108,10 +108,13 @@ public class BlockMushroom extends BlockFlower { event = new StructureGrowEvent(location, TreeType.RED_MUSHROOM, bonemeal, player, new ArrayList<BlockState>()); worldgenhugemushroom = new WorldGenHugeMushroom(1); } - if (worldgenhugemushroom != null && event != null){ + if (worldgenhugemushroom != null && event != null) { grown = worldgenhugemushroom.grow(world, random, i, j, k, event, itemstack, world.getWorld()); + if (event.isFromBonemeal() && itemstack != null) { + --itemstack.count; + } } - if (!grown || event.isCancelled()){ + if (!grown || event.isCancelled()) { world.setRawTypeIdAndData(i, j, k, this.id, l); return false; } |