mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-30 16:19:03 +01:00
0ddd20c6f7
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: ead719a65 SPIGOT-7136: Cancelling PlayerInteractEntityEvent with the Allay desyncs 8468e167e SPIGOT-7137: StructureGrowEvent isFromBonemeal and getPlayer have incorrect values d45057c59 SPIGOT-7089: Crash when command blocks attempt to load worlds Spigot Changes: 450dcaa8 Rebuild patches
41 lines
2.1 KiB
Diff
41 lines
2.1 KiB
Diff
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 d53972b69322e03d7e8054a2dcdbdb963055988c..5f3592f570fae791f2bd55d05d02c8bb5ecc0f85 100644
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
@@ -601,9 +601,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
|
}
|
|
|
|
worlddata.setModdedInfo(this.getServerModName(), this.getModdedStatus().shouldReportAsModified());
|
|
+ this.addLevel(world); // Paper - move up
|
|
this.initWorld(world, worlddata, worldData, worlddata.worldGenSettings());
|
|
|
|
- this.addLevel(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 9162384ac3365f43aa9749e1242553ca14045f47..d5ee84449de7fe6dc5a2a6a2044a93f14901ea80 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -1241,10 +1241,11 @@ public final class CraftServer implements Server {
|
|
return null;
|
|
}
|
|
|
|
+ this.console.addLevel(internal); // Paper - move up
|
|
this.console.initWorld(internal, worlddata, worlddata, worlddata.worldGenSettings());
|
|
|
|
internal.setSpawnSettings(true, true);
|
|
- this.console.addLevel(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
|