From a46ef53b75a147194163beafb265d8e8a0c9f1cd Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 12 May 2019 16:59:21 +1000 Subject: [PATCH] Load custom worlds from correct location --- nms-patches/DimensionManager.patch | 12 ++---------- .../java/org/bukkit/craftbukkit/CraftServer.java | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/nms-patches/DimensionManager.patch b/nms-patches/DimensionManager.patch index 82d00a56f1..200fee1f8a 100644 --- a/nms-patches/DimensionManager.patch +++ b/nms-patches/DimensionManager.patch @@ -14,8 +14,9 @@ + // CraftBukkit end private final int d; private final String e; - private final String f; +- private final String f; - private final BiFunction g; ++ public final String f; + public final BiFunction g; private final boolean h; @@ -36,15 +37,6 @@ } public static DimensionManager a(Dynamic dynamic) { -@@ -54,7 +58,7 @@ - } - - public String toString() { -- return a(this).toString(); -+ return this.e + "(" + a(getType()) + ")"; // CraftBukkit - } - - @Nullable @@ -80,4 +84,12 @@ public T a(DynamicOps dynamicops) { return dynamicops.createString(IRegistry.DIMENSION_TYPE.getKey(this).toString()); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 6728a60ccd..55f3614bb0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -923,7 +923,7 @@ public final class CraftServer implements Server { } DimensionManager actualDimension = DimensionManager.a(creator.environment().getId()); - DimensionManager internalDimension = DimensionManager.a(name, new DimensionManager(dimension, name, name, (w, manager) -> actualDimension.g.apply(w, manager), actualDimension.hasSkyLight(), actualDimension)); + DimensionManager internalDimension = DimensionManager.a(name, new DimensionManager(dimension, actualDimension.c(), actualDimension.f, (w, manager) -> actualDimension.g.apply(w, manager), actualDimension.hasSkyLight(), actualDimension)); WorldServer internal = (WorldServer) new WorldServer(console, console.executorService, sdm, worlddata, internalDimension, console.getMethodProfiler(), getServer().worldLoadListenerFactory.create(11), creator.environment(), generator); if (!(worlds.containsKey(name.toLowerCase(java.util.Locale.ENGLISH)))) {