From b8de21cf482f894a2081e13c55ae3a7c269e4c7a Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Fri, 7 Jan 2022 13:49:39 -0800
Subject: [PATCH] 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.
---
 patches/server/Allow-Saving-of-Oversized-Chunks.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/patches/server/Allow-Saving-of-Oversized-Chunks.patch b/patches/server/Allow-Saving-of-Oversized-Chunks.patch
index dd376ec64d..5389d28811 100644
--- a/patches/server/Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/server/Allow-Saving-of-Oversized-Chunks.patch
@@ -191,8 +191,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                }
 +                CompoundTag oversizedLevel = oversizedData.getCompound("Level");
 +
-+                mergeChunkList(chunk, oversizedLevel, "entities", "Entities");
-+                mergeChunkList(chunk, oversizedLevel, "block_entities", "TileEntities");
++                mergeChunkList(chunk.getCompound("Level"), oversizedLevel, "Entities", "Entities");
++                mergeChunkList(chunk.getCompound("Level"), oversizedLevel, "TileEntities", "TileEntities");
 +
 +                return chunk;
 +            } catch (Throwable throwable) {