From f6585dfe97bdad700474041ada747e55aae25a75 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Wed, 12 May 2021 01:07:08 -0700 Subject: [PATCH] Updated Upstream (CraftBukkit) 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: 51e2981b #831: Reload unloaded main worlds correctly --- Spigot-Server-Patches/Implement-Keyed-on-World.patch | 10 +++++----- work/CraftBukkit | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Spigot-Server-Patches/Implement-Keyed-on-World.patch b/Spigot-Server-Patches/Implement-Keyed-on-World.patch index 0e06b28a63..ff688072ed 100644 --- a/Spigot-Server-Patches/Implement-Keyed-on-World.patch +++ b/Spigot-Server-Patches/Implement-Keyed-on-World.patch @@ -68,14 +68,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -0,0 +0,0 @@ public final class CraftServer implements Server { - chunkgenerator = worlddimension.c(); + } else if (name.equals(levelName + "_the_end")) { + worldKey = net.minecraft.world.level.World.THE_END; + } else { +- worldKey = ResourceKey.a(IRegistry.L, new MinecraftKey(name.toLowerCase(java.util.Locale.ENGLISH))); ++ worldKey = ResourceKey.newResourceKey(IRegistry.getWorldRegistry(), new net.minecraft.resources.MinecraftKey(creator.key().getNamespace().toLowerCase(java.util.Locale.ENGLISH), creator.key().getKey().toLowerCase(java.util.Locale.ENGLISH))); // Paper } -- ResourceKey worldKey = ResourceKey.a(IRegistry.L, new MinecraftKey(name.toLowerCase(java.util.Locale.ENGLISH))); -+ ResourceKey worldKey = ResourceKey.newResourceKey(IRegistry.getWorldRegistry(), new MinecraftKey(creator.key().getNamespace().toLowerCase(java.util.Locale.ENGLISH), creator.key().getKey().toLowerCase(java.util.Locale.ENGLISH))); // Paper - WorldServer internal = (WorldServer) new WorldServer(console, console.executorService, worldSession, worlddata, worldKey, dimensionmanager, getServer().worldLoadListenerFactory.create(11), - chunkgenerator, worlddata.getGeneratorSettings().isDebugWorld(), j, creator.environment() == Environment.NORMAL ? list : ImmutableList.of(), true, creator.environment(), generator); @@ -0,0 +0,0 @@ public final class CraftServer implements Server { return null; } diff --git a/work/CraftBukkit b/work/CraftBukkit index 59e2ce9b75..51e2981b5b 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 59e2ce9b7556b0c5e22bab39f806b200c1b5e274 +Subproject commit 51e2981b5ba4910e93f87bbf95e111e78ad6f9f3