From 854f3d35c197725ce2e3e0bf73f2f8c34356685e Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Tue, 22 Feb 2022 14:28:34 -0800
Subject: [PATCH] Put world into worldlist before initing the world

Some parts of legacy conversion will need the overworld
to get the legacy structure data storage
---
 ...o-worldlist-before-initing-the-world.patch | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 patches/server/0874-Put-world-into-worldlist-before-initing-the-world.patch

diff --git a/patches/server/0874-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0874-Put-world-into-worldlist-before-initing-the-world.patch
new file mode 100644
index 000000000..5aa64d679
--- /dev/null
+++ b/patches/server/0874-Put-world-into-worldlist-before-initing-the-world.patch
@@ -0,0 +1,41 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Spottedleaf <Spottedleaf@users.noreply.github.com>
+Date: Tue, 22 Feb 2022 14:21:35 -0800
+Subject: [PATCH] Put world into worldlist before initing the world
+
+Some parts of legacy conversion will need the overworld
+to get the legacy structure data storage
+
+diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+index 1674deebbeab0995ed7acacf8052e1daf4d2a7bc..053dbe5eef6574cfe98ab7499181bdd83a81f2e1 100644
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java
++++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -693,9 +693,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+             }
+ 
+             worlddata.setModdedInfo(this.getServerModName(), this.getModdedStatus().shouldReportAsModified());
++            this.levels.put(world.dimension(), world); // Paper - move up
+             this.initWorld(world, worlddata, worldData, worlddata.worldGenSettings());
+ 
+-            this.levels.put(world.dimension(), world);
++            // Paper - move up
+             this.getPlayerList().addWorldborderListener(world);
+ 
+             if (worlddata.getCustomBossEvents() != null) {
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+index dbbae437123163c60c3f60a48043967a8adbd124..caeaf2978d7a8b7f2d1595e102f2751d837172b4 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+@@ -1255,10 +1255,11 @@ public final class CraftServer implements Server {
+             return null;
+         }
+ 
++        console.levels.put(internal.dimension(), internal); // Paper - move up
+         this.console.initWorld(internal, worlddata, worlddata, worlddata.worldGenSettings());
+ 
+         internal.setSpawnSettings(true, true);
+-        console.levels.put(internal.dimension(), internal);
++        // Paper - move up
+ 
+         this.getServer().prepareLevels(internal.getChunkSource().chunkMap.progressListener, internal);
+         internal.entityManager.tick(); // SPIGOT-6526: Load pending entities so they are available to the API