From 7b6e8dded676633e84e49aeca1edf33dcd085f29 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Thu, 26 Jul 2018 22:11:02 +1000 Subject: [PATCH] SPIGOT-4140, SPIGOT-4157: World generation errors By: md_5 --- paper-server/nms-patches/MinecraftServer.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paper-server/nms-patches/MinecraftServer.patch b/paper-server/nms-patches/MinecraftServer.patch index c879c7f4de..6016cba435 100644 --- a/paper-server/nms-patches/MinecraftServer.patch +++ b/paper-server/nms-patches/MinecraftServer.patch @@ -168,6 +168,7 @@ + worlddata = new WorldData(worldsettings, s1); + } + worlddata.checkName(s1); // CraftBukkit - Migration did not rewrite the level.dat; This forces 1.8 to take the last loaded world as respawn (in this case the end) ++ this.a(idatamanager.getDirectory(), worlddata); if (this.N()) { - this.worldServer[j] = (WorldServer) (new DemoWorldServer(this, idatamanager, worlddata, b0, this.methodProfiler)).b(); + world = (WorldServer) (new DemoWorldServer(this, idatamanager, worlddata, dimension, this.methodProfiler)).b(); @@ -178,7 +179,6 @@ - this.worldServer[j].a(worldsettings); + world.a(worldsettings); -+ this.a(idatamanager.getDirectory(), worlddata); + this.server.scoreboardManager = new org.bukkit.craftbukkit.scoreboard.CraftScoreboardManager(this, world.getScoreboard()); } else { - this.worldServer[j] = (WorldServer) (new SecondaryWorldServer(this, idatamanager, b0, this.worldServer[0], this.methodProfiler)).b();