-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove UpgradeData neighbour ticks outside of range
The lists are only supposed to contain ticks for the 1 radius neighbours of the chunk.
- Loading branch information
1 parent
98c567f
commit 4179b8f
Showing
1 changed file
with
49 additions
and
0 deletions.
There are no files selected for viewing
49 changes: 49 additions & 0 deletions
49
patches/server/1001-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Spottedleaf <Spottedleaf@users.noreply.github.com> | ||
Date: Wed, 9 Aug 2023 14:00:40 -0700 | ||
Subject: [PATCH] Remove UpgradeData neighbour ticks outside of range | ||
|
||
The lists are only supposed to contain ticks for the 1 radius | ||
neighbours of the chunk. | ||
|
||
diff --git a/src/main/java/net/minecraft/world/level/chunk/UpgradeData.java b/src/main/java/net/minecraft/world/level/chunk/UpgradeData.java | ||
index 8e2a7ea230fedb9094a159a83c9d69f6df3832f3..62709ed72faf823e18ad77477eb2f5dbf9c98660 100644 | ||
--- a/src/main/java/net/minecraft/world/level/chunk/UpgradeData.java | ||
+++ b/src/main/java/net/minecraft/world/level/chunk/UpgradeData.java | ||
@@ -100,6 +100,24 @@ public class UpgradeData { | ||
|
||
} | ||
|
||
+ // Paper start - filter out relocated neighbour ticks | ||
+ private static <T> void filterTickList(int chunkX, int chunkZ, List<SavedTick<T>> ticks) { | ||
+ for (java.util.Iterator<SavedTick<T>> iterator = ticks.iterator(); iterator.hasNext();) { | ||
+ SavedTick<T> tick = iterator.next(); | ||
+ BlockPos tickPos = tick.pos(); | ||
+ int tickCX = tickPos.getX() >> 4; | ||
+ int tickCZ = tickPos.getZ() >> 4; | ||
+ | ||
+ int dist = Math.max(Math.abs(chunkX - tickCX), Math.abs(chunkZ - tickCZ)); | ||
+ | ||
+ if (dist != 1) { | ||
+ LOGGER.warn("Neighbour tick '" + tick + "' serialized in chunk (" + chunkX + "," + chunkZ + ") is too far (" + tickCX + "," + tickCZ + ")"); | ||
+ iterator.remove(); | ||
+ } | ||
+ } | ||
+ } | ||
+ // Paper end - filter out relocated neighbour ticks | ||
+ | ||
public void upgrade(LevelChunk chunk) { | ||
this.upgradeInside(chunk); | ||
|
||
@@ -107,6 +125,11 @@ public class UpgradeData { | ||
upgradeSides(chunk, direction8); | ||
} | ||
|
||
+ // Paper start - filter out relocated neighbour ticks | ||
+ filterTickList(chunk.locX, chunk.locZ, this.neighborBlockTicks); | ||
+ filterTickList(chunk.locX, chunk.locZ, this.neighborFluidTicks); | ||
+ // Paper end - filter out relocated neighbour ticks | ||
+ | ||
Level level = chunk.getLevel(); | ||
this.neighborBlockTicks.forEach((tick) -> { | ||
Block block = tick.type() == Blocks.AIR ? level.getBlockState(tick.pos()).getBlock() : tick.type(); |