13
0
geforkt von Mirrors/Paper
Paper/Spigot-Server-Patches/0096-Prevent-Fire-from-loading-chunks.patch

58 Zeilen
2.4 KiB
Diff

From b2ffa4ad258408e863f989014361e286f3679fcf 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
This causes the nether to spam unload/reload chunks, plus overall
bad behavior.
diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
index 8645a0ebd0..f769df41a6 100644
--- a/src/main/java/net/minecraft/server/BlockFire.java
+++ b/src/main/java/net/minecraft/server/BlockFire.java
2019-04-27 05:05:36 +02:00
@@ -163,6 +163,7 @@ public class BlockFire extends Block {
}
2019-04-27 05:05:36 +02:00
blockposition_mutableblockposition.g(blockposition).e(l, j1, i1);
+ if (!world.isLoaded(blockposition_mutableblockposition)) continue; // Paper
int l1 = this.a((IWorldReader) world, (BlockPosition) blockposition_mutableblockposition);
if (l1 > 0) {
2019-04-27 05:05:36 +02:00
@@ -208,10 +209,16 @@ public class BlockFire extends Block {
}
private void a(World world, BlockPosition blockposition, int i, Random random, int j, BlockPosition sourceposition) { // CraftBukkit add sourceposition
2019-04-27 05:05:36 +02:00
- int k = this.q(world.getType(blockposition));
+ // Paper start
+ final IBlockData iblockdata = world.getTypeIfLoaded(blockposition);
2019-04-27 05:05:36 +02:00
+ if (iblockdata == null) {
+ return;
+ }
+ int k = this.q(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());
2019-04-27 05:05:36 +02:00
@@ -269,8 +276,12 @@ public class BlockFire extends Block {
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
2019-04-27 05:05:36 +02:00
i = Math.max(this.r(iblockdata), i);
}
--
2019-04-23 06:47:07 +02:00
2.21.0