From eda80e3d7c23e58026381e6d397b79fed5501a41 Mon Sep 17 00:00:00 2001 From: Mariell Hoversholm Date: Mon, 21 Sep 2020 20:40:48 +0200 Subject: [PATCH] Prevent fire from spreading to invalid locations --- ...Prevent-Fire-from-loading-chunks-wrongly-spread.patch} | 8 +++++--- Spigot-Server-Patches/0258-Add-TNTPrimeEvent.patch | 2 +- .../0569-PortalCreateEvent-needs-to-know-its-entity.patch | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) rename Spigot-Server-Patches/{0090-Prevent-Fire-from-loading-chunks.patch => 0090-Prevent-Fire-from-loading-chunks-wrongly-spread.patch} (90%) diff --git a/Spigot-Server-Patches/0090-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0090-Prevent-Fire-from-loading-chunks-wrongly-spread.patch similarity index 90% rename from Spigot-Server-Patches/0090-Prevent-Fire-from-loading-chunks.patch rename to Spigot-Server-Patches/0090-Prevent-Fire-from-loading-chunks-wrongly-spread.patch index 71c1c724a4..798a8103b1 100644 --- a/Spigot-Server-Patches/0090-Prevent-Fire-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0090-Prevent-Fire-from-loading-chunks-wrongly-spread.patch @@ -1,13 +1,15 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 17 Apr 2016 17:27:09 -0400 -Subject: [PATCH] Prevent Fire from loading chunks +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..48b52b58ff4779fe92d17ab3b3c4cf608917a325 100644 +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 { @@ -23,7 +25,7 @@ index 3d6aae40cab0cefbfc56389d9d2d37d2f0badd98..48b52b58ff4779fe92d17ab3b3c4cf60 } blockposition_mutableblockposition.a((BaseBlockPosition) blockposition, l, j1, i1); -+ if (!worldserver.isLoaded(blockposition_mutableblockposition)) continue; // Paper ++ if (blockposition_mutableblockposition.isInvalidYLocation() || !worldserver.isLoaded(blockposition_mutableblockposition)) continue; // Paper int l1 = this.a((IWorldReader) worldserver, (BlockPosition) blockposition_mutableblockposition); if (l1 > 0) { diff --git a/Spigot-Server-Patches/0258-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0258-Add-TNTPrimeEvent.patch index bdb3b686c1..686f30f7f1 100644 --- a/Spigot-Server-Patches/0258-Add-TNTPrimeEvent.patch +++ b/Spigot-Server-Patches/0258-Add-TNTPrimeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add TNTPrimeEvent diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java -index 48b52b58ff4779fe92d17ab3b3c4cf608917a325..acd0ec4bf30c5d559d99ec449fef166ce59076e6 100644 +index e79f3872de2989d0b9b28a8b49cc399968f5bdbf..4716f366342a3ef70d0ea50e3747786fad1e3573 100644 --- a/src/main/java/net/minecraft/server/BlockFire.java +++ b/src/main/java/net/minecraft/server/BlockFire.java @@ -3,6 +3,7 @@ package net.minecraft.server; diff --git a/Spigot-Server-Patches/0569-PortalCreateEvent-needs-to-know-its-entity.patch b/Spigot-Server-Patches/0569-PortalCreateEvent-needs-to-know-its-entity.patch index 6cb84cfb93..9154dbbb32 100644 --- a/Spigot-Server-Patches/0569-PortalCreateEvent-needs-to-know-its-entity.patch +++ b/Spigot-Server-Patches/0569-PortalCreateEvent-needs-to-know-its-entity.patch @@ -22,7 +22,7 @@ index b6081d259444f0d78736802b5d565faf776e825f..505d40278d4472e0015a53af8e93bd81 public void onPlace(IBlockData iblockdata, World world, BlockPosition blockposition, IBlockData iblockdata1, boolean flag) { org.spigotmc.AsyncCatcher.catchOp("block onPlace"); // Spigot diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java -index 5ef90510b8bdac2dcf58cabfa78ba48a30a22a97..e2dd27be6b523c6e6668923c1b1900cb9251f39f 100644 +index e5d75a8a93ffe7bc3747b48210eea6189a956d54..0e6ce21db67447d0eb84eb1633653decc172b2da 100644 --- a/src/main/java/net/minecraft/server/BlockFire.java +++ b/src/main/java/net/minecraft/server/BlockFire.java @@ -343,8 +343,10 @@ public class BlockFire extends BlockFireAbstract {