13
0
geforkt von Mirrors/Paper

Fix loading secondary worlds

By: md_5 <git@md-5.net>
Dieser Commit ist enthalten in:
CraftBukkit/Spigot 2019-04-27 20:09:40 +10:00
Ursprung e36edd57b4
Commit 8f36a64ccd

Datei anzeigen

@ -351,7 +351,7 @@
BlockPosition blockposition = worldserver.getSpawn(); BlockPosition blockposition = worldserver.getSpawn();
worldloadlistener.a(new ChunkCoordIntPair(blockposition)); worldloadlistener.a(new ChunkCoordIntPair(blockposition));
@@ -379,16 +543,20 @@ @@ -379,17 +543,21 @@
chunkproviderserver.addTicket(TicketType.START, new ChunkCoordIntPair(blockposition), 11, Unit.INSTANCE); chunkproviderserver.addTicket(TicketType.START, new ChunkCoordIntPair(blockposition), 11, Unit.INSTANCE);
while (chunkproviderserver.b() != 441) { while (chunkproviderserver.b() != 441) {
@ -369,6 +369,7 @@
- -
- while (iterator.hasNext()) { - while (iterator.hasNext()) {
- DimensionManager dimensionmanager = (DimensionManager) iterator.next(); - DimensionManager dimensionmanager = (DimensionManager) iterator.next();
- ForcedChunk forcedchunk = (ForcedChunk) this.getWorldServer(dimensionmanager).getWorldPersistentData().b(ForcedChunk::new, "chunks");
+ // CraftBukkit start + // CraftBukkit start
+ // this.nextTick += 100L; + // this.nextTick += 100L;
+ this.executeModerately(); + this.executeModerately();
@ -376,10 +377,11 @@
+ +
+ if (true) { + if (true) {
+ DimensionManager dimensionmanager = worldserver.worldProvider.getDimensionManager(); + DimensionManager dimensionmanager = worldserver.worldProvider.getDimensionManager();
+ ForcedChunk forcedchunk = (ForcedChunk) worldserver.getWorldPersistentData().b(ForcedChunk::new, "chunks");
+ // CraftBukkit end + // CraftBukkit end
ForcedChunk forcedchunk = (ForcedChunk) this.getWorldServer(dimensionmanager).getWorldPersistentData().b(ForcedChunk::new, "chunks");
if (forcedchunk != null) { if (forcedchunk != null) {
WorldServer worldserver1 = this.getWorldServer(dimensionmanager);
@@ -404,10 +572,17 @@ @@ -404,10 +572,17 @@
} }
} }