From a875ee41605e4c722e9ed5a8ed1fa5392a694fe3 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 27 Apr 2019 20:09:40 +1000 Subject: [PATCH] Fix loading secondary worlds --- nms-patches/MinecraftServer.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nms-patches/MinecraftServer.patch b/nms-patches/MinecraftServer.patch index cf0c1292f3..80a20100a0 100644 --- a/nms-patches/MinecraftServer.patch +++ b/nms-patches/MinecraftServer.patch @@ -351,7 +351,7 @@ BlockPosition blockposition = worldserver.getSpawn(); worldloadlistener.a(new ChunkCoordIntPair(blockposition)); -@@ -379,16 +543,20 @@ +@@ -379,17 +543,21 @@ chunkproviderserver.addTicket(TicketType.START, new ChunkCoordIntPair(blockposition), 11, Unit.INSTANCE); while (chunkproviderserver.b() != 441) { @@ -369,6 +369,7 @@ - - while (iterator.hasNext()) { - DimensionManager dimensionmanager = (DimensionManager) iterator.next(); +- ForcedChunk forcedchunk = (ForcedChunk) this.getWorldServer(dimensionmanager).getWorldPersistentData().b(ForcedChunk::new, "chunks"); + // CraftBukkit start + // this.nextTick += 100L; + this.executeModerately(); @@ -376,10 +377,11 @@ + + if (true) { + DimensionManager dimensionmanager = worldserver.worldProvider.getDimensionManager(); ++ ForcedChunk forcedchunk = (ForcedChunk) worldserver.getWorldPersistentData().b(ForcedChunk::new, "chunks"); + // CraftBukkit end - ForcedChunk forcedchunk = (ForcedChunk) this.getWorldServer(dimensionmanager).getWorldPersistentData().b(ForcedChunk::new, "chunks"); if (forcedchunk != null) { + WorldServer worldserver1 = this.getWorldServer(dimensionmanager); @@ -404,10 +572,17 @@ } }