summaryrefslogtreecommitdiffstats
path: root/nms-patches/BlockFire.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2017-05-19 21:00:13 +1000
committermd_5 <git@md-5.net>2017-05-19 21:00:13 +1000
commit10043529907a4ba913ebe2712876e4b1911263b8 (patch)
tree37f3cbb2527d02eac320ed0900bf92a4f3c8407c /nms-patches/BlockFire.patch
parent3ecbb59cbb9e20064d04628d26387742705ab9ac (diff)
downloadcraftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.tar
craftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.tar.gz
craftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.tar.lz
craftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.tar.xz
craftbukkit-10043529907a4ba913ebe2712876e4b1911263b8.zip
Update to Minecraft 1.12-pre5
Diffstat (limited to 'nms-patches/BlockFire.patch')
-rw-r--r--nms-patches/BlockFire.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/nms-patches/BlockFire.patch b/nms-patches/BlockFire.patch
index 11fa2edf..f5ce1cd8 100644
--- a/nms-patches/BlockFire.patch
+++ b/nms-patches/BlockFire.patch
@@ -25,7 +25,7 @@
@@ -108,7 +114,7 @@
int i = ((Integer) iblockdata.get(BlockFire.AGE)).intValue();
- if (!flag && world.Y() && this.b(world, blockposition) && random.nextFloat() < 0.2F + (float) i * 0.03F) {
+ if (!flag && world.isRaining() && this.b(world, blockposition) && random.nextFloat() < 0.2F + (float) i * 0.03F) {
- world.setAir(blockposition);
+ fireExtinguished(world, blockposition); // CraftBukkit - extinguished by rain
} else {
@@ -34,7 +34,7 @@
@@ -119,14 +125,14 @@
if (!flag) {
if (!this.c(world, blockposition)) {
- if (!world.getType(blockposition.down()).r() || i > 3) {
+ if (!world.getType(blockposition.down()).q() || i > 3) {
- world.setAir(blockposition);
+ fireExtinguished(world, blockposition); // CraftBukkit
}
@@ -126,7 +126,7 @@
@@ -276,7 +315,7 @@
public void a(IBlockData iblockdata, World world, BlockPosition blockposition, Block block, BlockPosition blockposition1) {
- if (!world.getType(blockposition.down()).r() && !this.c(world, blockposition)) {
+ if (!world.getType(blockposition.down()).q() && !this.c(world, blockposition)) {
- world.setAir(blockposition);
+ fireExtinguished(world, blockposition); // CraftBukkit - fuel block gone
}
@@ -135,7 +135,7 @@
@@ -284,7 +323,7 @@
public void onPlace(World world, BlockPosition blockposition, IBlockData iblockdata) {
if (world.worldProvider.getDimensionManager().getDimensionID() > 0 || !Blocks.PORTAL.b(world, blockposition)) {
- if (!world.getType(blockposition.down()).r() && !this.c(world, blockposition)) {
+ if (!world.getType(blockposition.down()).q() && !this.c(world, blockposition)) {
- world.setAir(blockposition);
+ fireExtinguished(world, blockposition); // CraftBukkit - fuel block broke
} else {