diff options
author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-09-16 20:10:11 +0100 |
---|---|---|
committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-09-16 20:10:11 +0100 |
commit | 900c541246e2b480b63be60e71a4a9a8acc61d77 (patch) | |
tree | 763d7de40757a8115b1c686f7c9ecefd19a8b119 /src/main/java/net/minecraft/server/BlockMushroom.java | |
parent | 94d1338febfe844faa42179e47ddc5d3432b0843 (diff) | |
download | craftbukkit-900c541246e2b480b63be60e71a4a9a8acc61d77.tar craftbukkit-900c541246e2b480b63be60e71a4a9a8acc61d77.tar.gz craftbukkit-900c541246e2b480b63be60e71a4a9a8acc61d77.tar.lz craftbukkit-900c541246e2b480b63be60e71a4a9a8acc61d77.tar.xz craftbukkit-900c541246e2b480b63be60e71a4a9a8acc61d77.zip |
Bunchafixes which may or may not have any end result
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockMushroom.java')
-rw-r--r-- | src/main/java/net/minecraft/server/BlockMushroom.java | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/main/java/net/minecraft/server/BlockMushroom.java b/src/main/java/net/minecraft/server/BlockMushroom.java index aae8a13d..775d7e18 100644 --- a/src/main/java/net/minecraft/server/BlockMushroom.java +++ b/src/main/java/net/minecraft/server/BlockMushroom.java @@ -51,18 +51,20 @@ public class BlockMushroom extends BlockFlower { k1 = k + random.nextInt(3) - 1; } - // CraftBukkit start - org.bukkit.World bworld = world.getWorld(); - org.bukkit.block.BlockState blockState = bworld.getBlockAt(i1, j1, k1).getState(); - blockState.setTypeId(this.id); + if (world.isEmpty(i1, j1, k1) && this.f(world, i1, j1, k1)) { + // CraftBukkit start + org.bukkit.World bworld = world.getWorld(); + org.bukkit.block.BlockState blockState = bworld.getBlockAt(i1, j1, k1).getState(); + blockState.setTypeId(this.id); - BlockSpreadEvent event = new BlockSpreadEvent(blockState.getBlock(), bworld.getBlockAt(i, j, k), blockState); - world.getServer().getPluginManager().callEvent(event); + BlockSpreadEvent event = new BlockSpreadEvent(blockState.getBlock(), bworld.getBlockAt(i, j, k), blockState); + world.getServer().getPluginManager().callEvent(event); - if (!event.isCancelled()) { - blockState.update(true); + if (!event.isCancelled()) { + blockState.update(true); + } + // CraftBukkit end } - // CraftBukkit end } } |