mirror/Paper
2
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-09 06:50:32 +08:00
Code Issues Packages Projects Releases 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 07915ea183
commit 0a4286cc42
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Spigot-Server-Patches/0092-Prevent-Fire-from-loading-chunks.patch
View File

@ -1,4 +1,4 @@
From 936235464e3c34bcc31d059836bcf5f37b3e3f18 Mon Sep 17 00:00:00 2001 From 6dc2a1dac812d060e40cac3d4230e69657431ce6 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 17 Apr 2016 17:27:09 -0400 Date: Sun, 17 Apr 2016 17:27:09 -0400
Subject: [PATCH] Prevent Fire from loading chunks Subject: [PATCH] Prevent Fire from loading chunks
@ -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
@@ -78,7 +78,7 @@ 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
}
}
@@ -163,6 +163,7 @@ public class BlockFire extends Block { @@ -163,6 +163,7 @@ public class BlockFire extends Block {
} }
@ -37,6 +46,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());
@@ -251,7 +258,7 @@ 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;
}
}
@@ -269,8 +276,12 @@ public class BlockFire extends Block { @@ -269,8 +276,12 @@ public class BlockFire extends Block {
for (int k = 0; k < j; ++k) { for (int k = 0; k < j; ++k) {
@ -52,6 +70,15 @@ index 2909f78f87..0ece78d4dc 100644
i = Math.max(this.r(iblockdata), i); i = Math.max(this.r(iblockdata), i);
} }
@@ -279,7 +290,7 @@ 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
-- --
2.25.1 2.25.1