diff options
| author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-02-21 22:30:01 +0000 |
|---|---|---|
| committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-02-21 22:30:01 +0000 |
| commit | f659231e347f0e06a24f94d72136d3dfd9f0c7c4 (patch) | |
| tree | 187de36cefbb4fa2df3adef0ec62f6da0c7b3f77 /src/main/java/net/minecraft/server/BlockFire.java | |
| parent | 67cf646014fa6336c7df4abefe85a2dec447d699 (diff) | |
| download | craftbukkit-f659231e347f0e06a24f94d72136d3dfd9f0c7c4.tar craftbukkit-f659231e347f0e06a24f94d72136d3dfd9f0c7c4.tar.gz craftbukkit-f659231e347f0e06a24f94d72136d3dfd9f0c7c4.tar.lz craftbukkit-f659231e347f0e06a24f94d72136d3dfd9f0c7c4.tar.xz craftbukkit-f659231e347f0e06a24f94d72136d3dfd9f0c7c4.zip | |
N.M.S cleanup in preparation for update
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockFire.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/BlockFire.java | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java index aacec771..62cbbc1b 100644 --- a/src/main/java/net/minecraft/server/BlockFire.java +++ b/src/main/java/net/minecraft/server/BlockFire.java @@ -137,18 +137,20 @@ public class BlockFire extends Block { org.bukkit.block.Block theBlock = (cworld.getBlockAt(i, j, k)); BlockBurnEvent event = new BlockBurnEvent(theBlock); server.getPluginManager().callEvent(event); - if(!event.isCancelled()) { - if (random.nextInt(2) == 0) { - world.e(i, j, k, this.id); - } else { - world.e(i, j, k, 0); - } - - if (flag) { - Block.TNT.a(world, i, j, k, 0); - } + if(event.isCancelled()) { + return; } // CraftBukkit end + + if (random.nextInt(2) == 0) { + world.e(i, j, k, this.id); + } else { + world.e(i, j, k, 0); + } + + if (flag) { + Block.TNT.a(world, i, j, k, 0); + } } } |