diff options
author | md_5 <git@md-5.net> | 2016-03-01 08:32:46 +1100 |
---|---|---|
committer | md_5 <git@md-5.net> | 2016-03-01 09:32:45 +1100 |
commit | aa008dff0f9bedbe88e1fe79831776b0a52eb90a (patch) | |
tree | cb520e0f4cc5d683fb9b7fb95de37480a7443dfb /nms-patches/BlockStationary.patch | |
parent | e1ebe524a78e27f6a2829ed4574fded3779094e1 (diff) | |
download | craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.gz craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.lz craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.xz craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.zip |
Update to Minecraft 1.9
Diffstat (limited to 'nms-patches/BlockStationary.patch')
-rw-r--r-- | nms-patches/BlockStationary.patch | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/nms-patches/BlockStationary.patch b/nms-patches/BlockStationary.patch index f58767ba..4f9bbe20 100644 --- a/nms-patches/BlockStationary.patch +++ b/nms-patches/BlockStationary.patch @@ -9,10 +9,10 @@ public class BlockStationary extends BlockFluids { protected BlockStationary(Material material) { -@@ -41,6 +43,13 @@ +@@ -45,6 +47,13 @@ if (block.material == Material.AIR) { - if (this.f(world, blockposition1)) { + if (this.c(world, blockposition1)) { + // CraftBukkit start - Prevent lava putting something on fire + if (world.getType(blockposition1) != Blocks.FIRE) { + if (CraftEventFactory.callBlockIgniteEvent(world, blockposition1.getX(), blockposition1.getY(), blockposition1.getZ(), blockposition.getX(), blockposition.getY(), blockposition.getZ()).isCancelled()) { @@ -23,10 +23,12 @@ world.setTypeUpdate(blockposition1, Blocks.FIRE.getBlockData()); return; } -@@ -53,6 +62,14 @@ - BlockPosition blockposition2 = blockposition.a(random.nextInt(3) - 1, 0, random.nextInt(3) - 1); +@@ -60,7 +69,16 @@ + return; + } - if (world.isEmpty(blockposition2.up()) && this.m(world, blockposition2)) { ++ // PAIL: rename + if (world.isEmpty(blockposition2.up()) && this.d(world, blockposition2)) { + // CraftBukkit start - Prevent lava putting something on fire + BlockPosition up = blockposition2.up(); + if (world.getType(up) != Blocks.FIRE) { |