geforkt von Mirrors/Paper
89d51d5f29
Because this exploit has been widely known for years and has not been fixed by Mojang, we decided that it was worth allowing people to toggle it on/off due to how easy it is to make it configurable. It should be noted that this decision does not promise all future exploits will be configurable.
51 Zeilen
2.3 KiB
Diff
51 Zeilen
2.3 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 8943081f270d5328b4f333b7bc1ae1a449d1788c..a5b90222cfad5b282f3f2db4dd5d1b201761fb72 100644
|
|
--- a/src/main/java/net/minecraft/world/level/chunk/UpgradeData.java
|
|
+++ b/src/main/java/net/minecraft/world/level/chunk/UpgradeData.java
|
|
@@ -99,6 +99,25 @@ public class UpgradeData {
|
|
|
|
}
|
|
|
|
+ // Paper start - filter out relocated neighbour ticks
|
|
+ // The lists are only supposed to contain ticks for the 1 radius neighbours of the chunk
|
|
+ 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);
|
|
|
|
@@ -106,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();
|