13
0
geforkt von Mirrors/Paper

Clean diff slightly in MinecraftServer

By: md_5 <git@md-5.net>
Dieser Commit ist enthalten in:
CraftBukkit/Spigot 2019-04-25 10:14:16 +10:00
Ursprung 2f808394c5
Commit 5ea2a0e8e4

Datei anzeigen

@ -349,7 +349,7 @@
BlockPosition blockposition = worldserver.getSpawn(); BlockPosition blockposition = worldserver.getSpawn();
worldloadlistener.a(new ChunkCoordIntPair(blockposition)); worldloadlistener.a(new ChunkCoordIntPair(blockposition));
@@ -385,11 +547,13 @@ @@ -385,10 +547,12 @@
this.nextTick += 100L; this.nextTick += 100L;
this.sleepForTick(); this.sleepForTick();
@ -359,14 +359,12 @@
- 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");
+ if (true) { + if (true) {
+ DimensionManager dimensionmanager = worldserver.worldProvider.getDimensionManager(); + DimensionManager dimensionmanager = worldserver.worldProvider.getDimensionManager();
+ // CraftBukkit end + // CraftBukkit end
+ ForcedChunk forcedchunk = (ForcedChunk) worldserver.getWorldPersistentData().b(ForcedChunk::new, "chunks"); ForcedChunk forcedchunk = (ForcedChunk) this.getWorldServer(dimensionmanager).getWorldPersistentData().b(ForcedChunk::new, "chunks");
if (forcedchunk != null) { if (forcedchunk != null) {
WorldServer worldserver1 = this.getWorldServer(dimensionmanager);
@@ -408,6 +572,8 @@ @@ -408,6 +572,8 @@
this.sleepForTick(); this.sleepForTick();
worldloadlistener.b(); worldloadlistener.b();