mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 11:06:29 +01:00
0cdce89d59
If a playerdata doesn't contain a valid, loaded world, reset to the main world spawn point
50 lines
2.2 KiB
Diff
50 lines
2.2 KiB
Diff
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();
|