mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-10 20:12:44 +01:00
Put world into worldlist before initing the world
Some parts of legacy conversion will need the overworld to get the legacy structure data storage
This commit is contained in:
parent
cdb893bb9e
commit
854f3d35c1
1 changed files with 41 additions and 0 deletions
|
@ -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
|
Loading…
Reference in a new issue