Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-19 18:31:18 +02:00
Code Issues Projects Releases Wiki Activity

Two more cases for BlockFire

Browse Source
This commit is contained in:
Thinkofdeath 2015-02-17 14:06:54 +00:00
parent 1af2a2283a
commit aa92a45301
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
nms-patches/BlockFire.patch
View File

@ -1,5 +1,5 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/BlockFire.java 2015-02-17 13:46:14.372294849 +0000
+++ src/main/java/net/minecraft/server/BlockFire.java 2015-02-17 13:46:14.372294849 +0000
--- ../work/decompile-8eb82bde//net/minecraft/server/BlockFire.java 2015-02-17 14:05:03.475599681 +0000
+++ src/main/java/net/minecraft/server/BlockFire.java 2015-02-17 14:05:03.475599681 +0000
@@ -4,6 +4,12 @@
import java.util.Map;
import java.util.Random;
@ -31,6 +31,23 @@
} else {
int i = ((Integer) iblockdata.get(BlockFire.AGE)).intValue();
@@ -133,14 +139,14 @@
if (!flag) {
if (!this.e(world, blockposition)) {
if (!World.a((IBlockAccess) world, blockposition.down()) || i > 3) {
- world.setAir(blockposition);
+ fireExtinguished(world, blockposition); // CraftBukkit
}
return;
}
if (!this.e((IBlockAccess) world, blockposition.down()) && i == 15 && random.nextInt(4) == 0) {
- world.setAir(blockposition);
+ fireExtinguished(world, blockposition); // CraftBukkit
return;
}
}
@@ -186,7 +192,26 @@
l1 = 15;
}