Paper/Spigot-Server-Patches/0089-Prevent-Fire-from-loading-chunks-wrongly-spread.patch

83 lines
4.1 KiB
Diff
Raw Normal View History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 17 Apr 2016 17:27:09 -0400
Subject: [PATCH] Prevent Fire from loading chunks & wrongly spread
This causes the nether to spam unload/reload chunks, plus overall
bad behavior.
This also stops fire from spreading to illegal locations.
diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
index 3d6aae40cab0cefbfc56389d9d2d37d2f0badd98..e79f3872de2989d0b9b28a8b49cc399968f5bdbf 100644
--- a/src/main/java/net/minecraft/server/BlockFire.java
+++ b/src/main/java/net/minecraft/server/BlockFire.java
@@ -115,7 +115,7 @@ public class BlockFire extends BlockFireAbstract {
BlockStateBoolean blockstateboolean = (BlockStateBoolean) BlockFire.h.get(enumdirection);
if (blockstateboolean != null) {
2020-06-25 13:00:35 +02:00
- iblockdata1 = (IBlockData) iblockdata1.set(blockstateboolean, this.e(iblockaccess.getType(blockposition.shift(enumdirection))));
+ iblockdata1 = (IBlockData) iblockdata1.set(blockstateboolean, this.e(iblockaccess.getTypeIfLoaded(blockposition.shift(enumdirection)))); // Paper - prevent chunk loads
}
}
@@ -195,6 +195,7 @@ public class BlockFire extends BlockFireAbstract {
}
2020-06-25 13:00:35 +02:00
blockposition_mutableblockposition.a((BaseBlockPosition) blockposition, l, j1, i1);
+ if (blockposition_mutableblockposition.isInvalidYLocation() || !worldserver.isLoaded(blockposition_mutableblockposition)) continue; // Paper
2019-12-11 03:43:21 +01:00
int l1 = this.a((IWorldReader) worldserver, (BlockPosition) blockposition_mutableblockposition);
if (l1 > 0) {
@@ -240,10 +241,16 @@ public class BlockFire extends BlockFireAbstract {
}
2020-06-25 13:00:35 +02:00
private void trySpread(World world, BlockPosition blockposition, int i, Random random, int j, BlockPosition sourceposition) { // CraftBukkit add sourceposition
- int k = this.getBurnChance(world.getType(blockposition));
+ // Paper start
+ final IBlockData iblockdata = world.getTypeIfLoaded(blockposition);
2019-04-27 05:05:36 +02:00
+ if (iblockdata == null) {
+ return;
+ }
2020-06-25 13:00:35 +02:00
+ int k = this.getBurnChance(iblockdata);
+ // Paper end
if (random.nextInt(i) < k) {
- IBlockData iblockdata = world.getType(blockposition);
+ //IBlockData iblockdata = world.getType(blockposition); // Paper
// CraftBukkit start
org.bukkit.block.Block theBlock = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
@@ -289,7 +296,7 @@ public class BlockFire extends BlockFireAbstract {
for (int j = 0; j < i; ++j) {
EnumDirection enumdirection = aenumdirection[j];
2020-06-25 13:00:35 +02:00
- if (this.e(iblockaccess.getType(blockposition.shift(enumdirection)))) {
+ if (this.e(iblockaccess.getTypeIfLoaded(blockposition.shift(enumdirection)))) { // Paper - prevent chunk loads
return true;
}
}
@@ -307,7 +314,12 @@ public class BlockFire extends BlockFireAbstract {
2019-04-27 05:05:36 +02:00
for (int k = 0; k < j; ++k) {
EnumDirection enumdirection = aenumdirection[k];
2019-04-27 05:05:36 +02:00
- IBlockData iblockdata = iworldreader.getType(blockposition.shift(enumdirection));
+ // Paper start
2019-04-27 05:05:36 +02:00
+ IBlockData iblockdata = iworldreader.getTypeIfLoaded(blockposition.shift(enumdirection));
+ if (iblockdata == null) {
+ continue;
+ }
+ // Paper end
2020-06-25 13:00:35 +02:00
i = Math.max(this.getFlameChance(iblockdata), i);
}
@@ -318,7 +330,7 @@ public class BlockFire extends BlockFireAbstract {
2020-06-25 13:00:35 +02:00
@Override
protected boolean e(IBlockData iblockdata) {
- return this.getFlameChance(iblockdata) > 0;
+ return iblockdata != null && this.getFlameChance(iblockdata) > 0; // Paper - iblockdata can be nullable if chunk is unloaded now
}
@Override