OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-21 14:39:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

Prevent Fire from loading chunks

Browse source 
Had my server die from this twice already as it can cause a chain reaction.
This commit is contained in:
Aikar 2020-04-17 00:29:53 -04:00
parent d97ce19f49
commit 1cc0c3ac35
1 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Spigot-Server-Patches/Prevent-Fire-from-loading-chunks.patch
View file

@ -7,9 +7,18 @@ This causes the nether to spam unload/reload chunks, plus overall
bad behavior. bad behavior.
diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
index 2909f78f87..0ece78d4dc 100644 index 2909f78f8..d32857c87 100644
--- a/src/main/java/net/minecraft/server/BlockFire.java --- a/src/main/java/net/minecraft/server/BlockFire.java
+++ b/src/main/java/net/minecraft/server/BlockFire.java +++ b/src/main/java/net/minecraft/server/BlockFire.java
@@ -0,0 +0,0 @@ public class BlockFire extends Block {
BlockStateBoolean blockstateboolean = (BlockStateBoolean) BlockFire.g.get(enumdirection);
if (blockstateboolean != null) {
- iblockdata1 = (IBlockData) iblockdata1.set(blockstateboolean, this.h(iblockaccess.getType(blockposition.shift(enumdirection))));
+ iblockdata1 = (IBlockData) iblockdata1.set(blockstateboolean, this.h(iblockaccess.getTypeIfLoaded(blockposition.shift(enumdirection)))); // Paper - prevent chunk loads
}
}
@@ -0,0 +0,0 @@ public class BlockFire extends Block { @@ -0,0 +0,0 @@ public class BlockFire extends Block {
} }
@ -38,6 +47,15 @@ index 2909f78f87..0ece78d4dc 100644
// CraftBukkit start // CraftBukkit start
org.bukkit.block.Block theBlock = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()); org.bukkit.block.Block theBlock = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
@@ -0,0 +0,0 @@ public class BlockFire extends Block { @@ -0,0 +0,0 @@ public class BlockFire extends Block {
for (int j = 0; j < i; ++j) {
EnumDirection enumdirection = aenumdirection[j];
- if (this.h(iblockaccess.getType(blockposition.shift(enumdirection)))) {
+ if (this.h(iblockaccess.getTypeIfLoaded(blockposition.shift(enumdirection)))) { // Paper - prevent chunk loads
return true;
}
}
@@ -0,0 +0,0 @@ public class BlockFire extends Block {
for (int k = 0; k < j; ++k) { for (int k = 0; k < j; ++k) {
EnumDirection enumdirection = aenumdirection[k]; EnumDirection enumdirection = aenumdirection[k];
@ -52,4 +70,13 @@ index 2909f78f87..0ece78d4dc 100644
i = Math.max(this.r(iblockdata), i); i = Math.max(this.r(iblockdata), i);
} }
@@ -0,0 +0,0 @@ public class BlockFire extends Block {
}
public boolean h(IBlockData iblockdata) {
- return this.r(iblockdata) > 0;
+ return iblockdata != null && this.r(iblockdata) > 0; // Paper - iblockdata can be nullable if chunk is unloaded now
}
@Override
-- --