40 lines
2.5 KiB
Diff
40 lines
2.5 KiB
Diff
|
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
|
||
|
|
index 0adf14af9841cd3a20a8b2c0c320eb06794ef261..f6a814f9305813eaafa56baa0327e0111cd4e38c 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
|
||
|
|
@@ -95,10 +95,24 @@ public class ChunkSerializer {
|
||
|
|
return holder.protoChunk;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ // Paper start
|
||
|
|
+ private static final int CURRENT_DATA_VERSION = SharedConstants.getCurrentVersion().getWorldVersion();
|
||
|
|
+ private static final boolean JUST_CORRUPT_IT = Boolean.getBoolean("Paper.ignoreWorldDataVersion");
|
||
|
|
+ // Paper end
|
||
|
|
+
|
||
|
|
public static InProgressChunkHolder loadChunk(ServerLevel worldserver, StructureManager definedstructuremanager, PoiManager villageplace, ChunkPos chunkcoordintpair, CompoundTag nbttagcompound, boolean distinguish) {
|
||
|
|
ArrayDeque<Runnable> tasksToExecuteOnMain = new ArrayDeque<>();
|
||
|
|
// Paper end
|
||
|
|
ChunkGenerator chunkgenerator = worldserver.getChunkSource().getGenerator();
|
||
|
|
+ // Paper start - Do NOT attempt to load chunks saved with newer versions
|
||
|
|
+ if (nbttagcompound.contains("DataVersion", 99)) {
|
||
|
|
+ int dataVersion = nbttagcompound.getInt("DataVersion");
|
||
|
|
+ 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);
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
BiomeSource worldchunkmanager = chunkgenerator.getBiomeSource();
|
||
|
|
CompoundTag nbttagcompound1 = nbttagcompound.getCompound("Level"); // Paper - diff on change, see ChunkRegionLoader#getChunkCoordinate
|
||
|
|
ChunkPos chunkcoordintpair1 = new ChunkPos(nbttagcompound1.getInt("xPos"), nbttagcompound1.getInt("zPos")); // Paper - diff on change, see ChunkRegionLoader#getChunkCoordinate
|