SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests Aktivität

Fix regenerate chunk method

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Nassim Jahnke 2022-07-24 22:11:35 +02:00
Ursprung f9f8a78753
Commit 6149f6f5e3
1 geänderte Dateien mit 4 neuen und 3 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

7
patches/server/Implement-regenerateChunk.patch
Datei anzeigen

@ -58,7 +58,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- PlayerChunk playerChunk = world.getPlayerChunkMap().getChunk(x, z); - PlayerChunk playerChunk = world.getPlayerChunkMap().getChunk(x, z);
- if (playerChunk != null) { - if (playerChunk != null) {
- playerChunk.chunk = chunk; - playerChunk.chunk = chunk;
+ final com.mojang.datafixers.util.Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure> either = chunkStatus.generate( + final java.util.concurrent.CompletableFuture<com.mojang.datafixers.util.Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> future = chunkStatus.generate(
+ Runnable::run, + Runnable::run,
+ serverLevel, + serverLevel,
+ serverChunkCache.getGenerator(), + serverChunkCache.getGenerator(),
@ -69,9 +69,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ }, + },
+ list, + list,
+ true + true
+ ).join(); + );
+ serverChunkCache.mainThreadProcessor.managedBlock(future::isDone);
+ if (chunkStatus == ChunkStatus.NOISE) { + if (chunkStatus == ChunkStatus.NOISE) {
+ either.left().ifPresent(chunk -> net.minecraft.world.level.levelgen.Heightmap.primeHeightmaps(chunk, ChunkStatus.POST_FEATURES)); + future.join().left().ifPresent(chunk -> net.minecraft.world.level.levelgen.Heightmap.primeHeightmaps(chunk, ChunkStatus.POST_FEATURES));
+ } + }
} }