Skip to content

Commit 5ccd305

Browse files
committed
Fix incorrect old oversized chunk data merging
All legacy oversized chunks were created before the new chunk format, so don't try to merge into the new format.
1 parent c3d812d commit 5ccd305

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

patches/server/0330-Allow-Saving-of-Oversized-Chunks.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ index 04e45b4de2f4e26853a4fed6271cf79ef8607154..44de464b5f2190944c7a7316a76e13f9
142142

143143
private final ChunkPos pos;
144144
diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
145-
index 40830a2b231df9bbf676d8325e76c8252a6c1d6c..2cbc17288b1dc52edb2bdad29976d0f551b1e176 100644
145+
index 40830a2b231df9bbf676d8325e76c8252a6c1d6c..a1bfcdd713c47d8613eb4af7625a64d51161690b 100644
146146
--- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
147147
+++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
148148
@@ -11,8 +11,10 @@ import java.nio.file.Files;
@@ -191,8 +191,8 @@ index 40830a2b231df9bbf676d8325e76c8252a6c1d6c..2cbc17288b1dc52edb2bdad29976d0f5
191191
+ }
192192
+ CompoundTag oversizedLevel = oversizedData.getCompound("Level");
193193
+
194-
+ mergeChunkList(chunk, oversizedLevel, "entities", "Entities");
195-
+ mergeChunkList(chunk, oversizedLevel, "block_entities", "TileEntities");
194+
+ mergeChunkList(chunk.getCompound("Level"), oversizedLevel, "Entities", "Entities");
195+
+ mergeChunkList(chunk.getCompound("Level"), oversizedLevel, "TileEntities", "TileEntities");
196196
+
197197
+ return chunk;
198198
+ } catch (Throwable throwable) {

0 commit comments

Comments
 (0)