diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-02-17 14:06:54 +0000 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-02-17 14:06:54 +0000 |
| commit | aa92a45301ee6ad932cd9fd8cd4814c7ac45e4f1 (patch) | |
| tree | 095c45bfda8c0e4806bc4290e95503a7cf326b29 | |
| parent | 1af2a2283aa04aa4244d8626a98b2ed3170bfaf3 (diff) | |
| download | craftbukkit-aa92a45301ee6ad932cd9fd8cd4814c7ac45e4f1.tar craftbukkit-aa92a45301ee6ad932cd9fd8cd4814c7ac45e4f1.tar.gz craftbukkit-aa92a45301ee6ad932cd9fd8cd4814c7ac45e4f1.tar.lz craftbukkit-aa92a45301ee6ad932cd9fd8cd4814c7ac45e4f1.tar.xz craftbukkit-aa92a45301ee6ad932cd9fd8cd4814c7ac45e4f1.zip | |
Two more cases for BlockFire
| -rw-r--r-- | nms-patches/BlockFire.patch | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/nms-patches/BlockFire.patch b/nms-patches/BlockFire.patch index 8930f215..f02af723 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-17 13:46:14.372294849 +0000 -+++ src/main/java/net/minecraft/server/BlockFire.java 2015-02-17 13:46:14.372294849 +0000 +--- ../work/decompile-8eb82bde//net/minecraft/server/BlockFire.java 2015-02-17 14:05:03.475599681 +0000 ++++ src/main/java/net/minecraft/server/BlockFire.java 2015-02-17 14:05:03.475599681 +0000 @@ -4,6 +4,12 @@ import java.util.Map; import java.util.Random; @@ -31,6 +31,23 @@ } else { int i = ((Integer) iblockdata.get(BlockFire.AGE)).intValue(); +@@ -133,14 +139,14 @@ + if (!flag) { + if (!this.e(world, blockposition)) { + if (!World.a((IBlockAccess) world, blockposition.down()) || i > 3) { +- world.setAir(blockposition); ++ fireExtinguished(world, blockposition); // CraftBukkit + } + + return; + } + + if (!this.e((IBlockAccess) world, blockposition.down()) && i == 15 && random.nextInt(4) == 0) { +- world.setAir(blockposition); ++ fireExtinguished(world, blockposition); // CraftBukkit + return; + } + } @@ -186,7 +192,26 @@ l1 = 15; } |