2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach@zachbr.io>
Date: Tue, 23 Jul 2019 20:44:47 -0500
Subject: [PATCH] Do not let the server load chunks from newer versions
If the server attempts to load a chunk generated by a newer version of
the game, immediately stop the server to prevent data corruption.
You can override this functionality at your own peril.
diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
2024-01-25 10:54:46 +01:00
index 5ef782ef14a9a880cb3db433bbee2d4a70d33718..29aaedbe70901fdd98f15f2ca5ba382106091d1a 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
+++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
2024-01-25 10:54:46 +01:00
@@ -84,6 +84,10 @@ public class ChunkSerializer {
public static final String BLOCK_LIGHT_TAG = "BlockLight";
public static final String SKY_LIGHT_TAG = "SkyLight";
2024-01-20 23:13:41 +01:00
+ // Paper start - Do not let the server load chunks from newer versions
2023-03-15 00:10:18 +01:00
+ private static final int CURRENT_DATA_VERSION = net.minecraft.SharedConstants.getCurrentVersion().getDataVersion().getVersion();
2021-06-11 14:02:28 +02:00
+ private static final boolean JUST_CORRUPT_IT = Boolean.getBoolean("Paper.ignoreWorldDataVersion");
2024-01-20 23:13:41 +01:00
+ // Paper end - Do not let the server load chunks from newer versions
2024-01-24 15:57:53 +01:00
public ChunkSerializer() {}
2024-01-25 10:54:46 +01:00
// Paper start - guard against serializing mismatching coordinates
@@ -99,6 +103,15 @@ public class ChunkSerializer {
2024-01-24 15:57:53 +01:00
}
// Paper end - guard against serializing mismatching coordinates
public static ProtoChunk read(ServerLevel world, PoiManager poiStorage, ChunkPos chunkPos, CompoundTag nbt) {
2024-01-20 23:13:41 +01:00
+ // Paper start - Do not let the server load chunks from newer versions
2024-01-04 14:38:26 +01:00
+ if (nbt.contains("DataVersion", net.minecraft.nbt.Tag.TAG_ANY_NUMERIC)) {
2024-01-24 13:07:40 +01:00
+ final int dataVersion = nbt.getInt("DataVersion");
2021-06-11 14:02:28 +02:00
+ if (!JUST_CORRUPT_IT && dataVersion > CURRENT_DATA_VERSION) {
+ new RuntimeException("Server attempted to load chunk saved with newer version of minecraft! " + dataVersion + " > " + CURRENT_DATA_VERSION).printStackTrace();
+ System.exit(1);
+ }
+ }
2024-01-24 13:07:40 +01:00
+ // Paper end - Do not let the server load chunks from newer versions
2024-01-21 12:53:04 +01:00
ChunkPos chunkcoordintpair1 = new ChunkPos(nbt.getInt("xPos"), nbt.getInt("zPos")); // Paper - guard against serializing mismatching coordinates; diff on change, see ChunkSerializer#getChunkCoordinate
2021-11-24 17:06:46 +01:00
2024-01-24 13:07:40 +01:00
if (!Objects.equals(chunkPos, chunkcoordintpair1)) {