diff options
Diffstat (limited to 'nms-patches/BlockFire.patch')
| -rw-r--r-- | nms-patches/BlockFire.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nms-patches/BlockFire.patch b/nms-patches/BlockFire.patch index 0e2e82e0..d36f2df3 100644 --- a/nms-patches/BlockFire.patch +++ b/nms-patches/BlockFire.patch @@ -49,7 +49,7 @@ Block block = world.getType(blockposition.down()).getBlock(); @@ -90,7 +113,7 @@ - int i = ((Integer) iblockdata.get(BlockFire.AGE)).intValue(); + int i = (Integer) iblockdata.get(BlockFire.AGE); if (!flag && world.isRaining() && this.a(world, blockposition) && random.nextFloat() < 0.2F + (float) i * 0.03F) { - world.setAir(blockposition); @@ -99,14 +99,14 @@ if (i2 > 0 && random.nextInt(k1) <= i2 && (!world.isRaining() || !this.a(world, (BlockPosition) blockposition_mutableblockposition))) { int j2 = Math.min(15, i + random.nextInt(5) / 4); -- world.setTypeAndData(blockposition_mutableblockposition, (IBlockData) this.a((IBlockAccess) world, (BlockPosition) blockposition_mutableblockposition).set(BlockFire.AGE, Integer.valueOf(j2)), 3); +- world.setTypeAndData(blockposition_mutableblockposition, (IBlockData) this.a((IBlockAccess) world, (BlockPosition) blockposition_mutableblockposition).set(BlockFire.AGE, j2), 3); + // CraftBukkit start - Call to stop spread of fire + if (world.getType(blockposition_mutableblockposition) != Blocks.FIRE) { + if (CraftEventFactory.callBlockIgniteEvent(world, blockposition_mutableblockposition, blockposition).isCancelled()) { + continue; + } + -+ CraftEventFactory.handleBlockSpreadEvent(world, blockposition, blockposition_mutableblockposition, (IBlockData) this.a((IBlockAccess) world, (BlockPosition) blockposition_mutableblockposition).set(BlockFire.AGE, Integer.valueOf(j2)), 3); // CraftBukkit ++ CraftEventFactory.handleBlockSpreadEvent(world, blockposition, blockposition_mutableblockposition, (IBlockData) this.a((IBlockAccess) world, (BlockPosition) blockposition_mutableblockposition).set(BlockFire.AGE, j2), 3); // CraftBukkit + } + // CraftBukkit end } |