summaryrefslogtreecommitdiffstats
path: root/src/main/java/net
diff options
context:
space:
mode:
authorPhil Watson <watson.filbert@gmail.com>2013-10-09 10:54:50 -0700
committerWesley Wolfe <weswolf@aol.com>2013-10-09 16:34:10 -0500
commit159403e08529744ba305f3a1c87f4acf2f3a9e0d (patch)
tree2015633ed6806dd4878a0de968ffdf08d1c2a99b /src/main/java/net
parentca5e0c6db0ee1b104158b973d9095d95d80de835 (diff)
downloadcraftbukkit-159403e08529744ba305f3a1c87f4acf2f3a9e0d.tar
craftbukkit-159403e08529744ba305f3a1c87f4acf2f3a9e0d.tar.gz
craftbukkit-159403e08529744ba305f3a1c87f4acf2f3a9e0d.tar.lz
craftbukkit-159403e08529744ba305f3a1c87f4acf2f3a9e0d.tar.xz
craftbukkit-159403e08529744ba305f3a1c87f4acf2f3a9e0d.zip
Call BlockFadeEvent for fire on inflammable block. Fixes BUKKIT-4835
This adds a call to fireExtinguished for fire burning out on inflamable blocks, similar to other causes of fire fading.
Diffstat (limited to 'src/main/java/net')
-rw-r--r--src/main/java/net/minecraft/server/BlockFire.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
index 9364fb94..a063b2f0 100644
--- a/src/main/java/net/minecraft/server/BlockFire.java
+++ b/src/main/java/net/minecraft/server/BlockFire.java
@@ -91,7 +91,7 @@ public class BlockFire extends Block {
world.a(i, j, k, this.id, this.a(world) + random.nextInt(10));
if (!flag && !this.k(world, i, j, k)) {
if (!world.w(i, j - 1, k) || l > 3) {
- world.setAir(i, j, k);
+ fireExtinguished(world, i, j, k); // CraftBukkit - burn out of inflammable block
}
} else if (!flag && !this.d((IBlockAccess) world, i, j - 1, k) && l == 15 && random.nextInt(4) == 0) {
fireExtinguished(world, i, j, k); // CraftBukkit - burn out