Update to Minecraft 1.8

For more information please see http://www.spigotmc.org/

1 files changed, 40 insertions, 0 deletions

diff --git a/nms-patches/BlockStationary.patch b/nms-patches/BlockStationary.patch
new file mode 100644
index 00000000..5ffd0a2e
--- /dev/null
+++ b/nms-patches/BlockStationary.patch
@@ -0,0 +1,40 @@
+--- ../work/decompile-bb26c12b/net/minecraft/server/BlockStationary.java	2014-11-27 08:59:46.577422392 +1100
++++ src/main/java/net/minecraft/server/BlockStationary.java	2014-11-27 08:42:10.152850911 +1100
+@@ -2,6 +2,8 @@
+ 
+ import java.util.Random;
+ 
++import org.bukkit.craftbukkit.event.CraftEventFactory;  // CraftBukkit
++
+ public class BlockStationary extends BlockFluids {
+ 
+     protected BlockStationary(Material material) {
+@@ -41,6 +43,13 @@
+ 
+                         if (block.material == Material.AIR) {
+                             if (this.e(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()) {
++                                        continue;
++                                    }
++                                }
++                                // CraftBukkit end
+                                 world.setTypeUpdate(blockposition1, Blocks.FIRE.getBlockData());
+                                 return;
+                             }
+@@ -53,6 +62,14 @@
+                         BlockPosition blockposition2 = blockposition.a(random.nextInt(3) - 1, 0, random.nextInt(3) - 1);
+ 
+                         if (world.isEmpty(blockposition2.up()) && this.m(world, blockposition2)) {
++                            // CraftBukkit start - Prevent lava putting something on fire
++                            BlockPosition up = blockposition2.up();
++                            if (world.getType(up) != Blocks.FIRE) {
++                                if (CraftEventFactory.callBlockIgniteEvent(world, up.getX(), up.getY(), up.getZ(), blockposition.getX(), blockposition.getY(), blockposition.getZ()).isCancelled()) {
++                                    continue;
++                                }
++                            }
++                            // CraftBukkit end
+                             world.setTypeUpdate(blockposition2.up(), Blocks.FIRE.getBlockData());
+                         }
+                     }