diff options
Diffstat (limited to 'nms-patches/BlockStationary.patch')
| -rw-r--r-- | nms-patches/BlockStationary.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nms-patches/BlockStationary.patch b/nms-patches/BlockStationary.patch index 02496cbe..9d4c7784 100644 --- a/nms-patches/BlockStationary.patch +++ b/nms-patches/BlockStationary.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/BlockStationary.java 2014-11-28 17:43:42.965707438 +0000 -+++ src/main/java/net/minecraft/server/BlockStationary.java 2014-11-28 17:38:19.000000000 +0000 +--- /home/matt/mc-dev-private//net/minecraft/server/BlockStationary.java 2015-02-26 22:40:22.267608143 +0000 ++++ src/main/java/net/minecraft/server/BlockStationary.java 2015-02-26 22:40:22.267608143 +0000 @@ -2,6 +2,8 @@ import java.util.Random; @@ -12,7 +12,7 @@ @@ -41,6 +43,13 @@ if (block.material == Material.AIR) { - if (this.e(world, blockposition1)) { + if (this.f(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()) { |