diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-02-17 13:47:14 +0000 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-02-17 13:47:14 +0000 |
| commit | 1af2a2283aa04aa4244d8626a98b2ed3170bfaf3 (patch) | |
| tree | c2a3d4f91e48abe16c7b0a454275134aef4824c9 | |
| parent | 726656b864cfff0851926df4fe95a2d51e911897 (diff) | |
| download | craftbukkit-1af2a2283aa04aa4244d8626a98b2ed3170bfaf3.tar craftbukkit-1af2a2283aa04aa4244d8626a98b2ed3170bfaf3.tar.gz craftbukkit-1af2a2283aa04aa4244d8626a98b2ed3170bfaf3.tar.lz craftbukkit-1af2a2283aa04aa4244d8626a98b2ed3170bfaf3.tar.xz craftbukkit-1af2a2283aa04aa4244d8626a98b2ed3170bfaf3.zip | |
Fix a missed case in BlockFire
| -rw-r--r-- | nms-patches/BlockFire.patch | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/nms-patches/BlockFire.patch b/nms-patches/BlockFire.patch index 483fa372..8930f215 100644 --- a/nms-patches/BlockFire.patch +++ b/nms-patches/BlockFire.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/BlockFire.java 2015-02-03 17:46:01.250916418 +0000 -+++ src/main/java/net/minecraft/server/BlockFire.java 2015-02-03 17:46:01.250916418 +0000 +--- ../work/decompile-8eb82bde//net/minecraft/server/BlockFire.java 2015-02-17 13:46:14.372294849 +0000 ++++ src/main/java/net/minecraft/server/BlockFire.java 2015-02-17 13:46:14.372294849 +0000 @@ -4,6 +4,12 @@ import java.util.Map; import java.util.Random; @@ -77,6 +77,15 @@ if (random.nextInt(j + 10) < 5 && !world.isRainingAt(blockposition)) { int l = j + random.nextInt(5) / 4; +@@ -233,7 +269,7 @@ + + world.setTypeAndData(blockposition, this.getBlockData().set(BlockFire.AGE, Integer.valueOf(l)), 3); + } else { +- world.setAir(blockposition); ++ fireExtinguished(world, blockposition); // CraftBukkit + } + + if (iblockdata.getBlock() == Blocks.TNT) { @@ -290,7 +326,7 @@ public void doPhysics(World world, BlockPosition blockposition, IBlockData iblockdata, Block block) { |