From 60da3f17d6a37f45cd0d63e3484b2b3eb6c4f2c8 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 24 Aug 2019 14:43:46 -0700 Subject: Fix flag for whether to override version check (#2502) --- ...443-Do-not-let-the-server-load-chunks-from-newer-version.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Spigot-Server-Patches/0443-Do-not-let-the-server-load-chunks-from-newer-version.patch b/Spigot-Server-Patches/0443-Do-not-let-the-server-load-chunks-from-newer-version.patch index 07cef370ee..98bc2d1c1d 100644 --- a/Spigot-Server-Patches/0443-Do-not-let-the-server-load-chunks-from-newer-version.patch +++ b/Spigot-Server-Patches/0443-Do-not-let-the-server-load-chunks-from-newer-version.patch @@ -1,4 +1,4 @@ -From 93a3a2f86bd4571ff2d8e3a66ba2c2d97f79356a Mon Sep 17 00:00:00 2001 +From a2c64719432ecef1a35ff34fc3405217b8025dea Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 23 Jul 2019 20:44:47 -0500 Subject: [PATCH] Do not let the server load chunks from newer versions @@ -9,7 +9,7 @@ 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/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index dce52ac0f..9c22e343a 100644 +index dce52ac0fa..305bfa9f95 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -288,8 +288,22 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { @@ -18,7 +18,7 @@ index dce52ac0f..9c22e343a 100644 + // Paper start + private static final int CURRENT_DATA_VERSION = 1631; -+ private static final boolean JUST_CORRUPT_IT = Boolean.valueOf("Paper.ignoreWorldDataVersion"); ++ private static final boolean JUST_CORRUPT_IT = Boolean.getBoolean("Paper.ignoreWorldDataVersion"); + // Paper end + @Nullable @@ -36,5 +36,5 @@ index dce52ac0f..9c22e343a 100644 ChunkStatus.Type chunkstatus_type = this.a(nbttagcompound); -- -2.22.0 +2.22.1 -- cgit v1.2.3