summaryrefslogtreecommitdiffstats
path: root/nms-patches
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2018-07-26 22:11:02 +1000
committermd_5 <git@md-5.net>2018-07-26 22:11:02 +1000
commite70d864f0063ccc5939ead10db5cc1fb6991fdf8 (patch)
tree8fabed53f0382004a32e009f15433f5a28664f14 /nms-patches
parent420f5fa779ee2968a593867906a23f87efc0bef1 (diff)
downloadcraftbukkit-e70d864f0063ccc5939ead10db5cc1fb6991fdf8.tar
craftbukkit-e70d864f0063ccc5939ead10db5cc1fb6991fdf8.tar.gz
craftbukkit-e70d864f0063ccc5939ead10db5cc1fb6991fdf8.tar.lz
craftbukkit-e70d864f0063ccc5939ead10db5cc1fb6991fdf8.tar.xz
craftbukkit-e70d864f0063ccc5939ead10db5cc1fb6991fdf8.zip
SPIGOT-4140, SPIGOT-4157: World generation errors
Diffstat (limited to 'nms-patches')
-rw-r--r--nms-patches/MinecraftServer.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/nms-patches/MinecraftServer.patch b/nms-patches/MinecraftServer.patch
index c879c7f4..6016cba4 100644
--- a/nms-patches/MinecraftServer.patch
+++ b/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();