From 3039146dc3df06237a08cdb1a1f4384103b7c369 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Tue, 23 Nov 2021 22:30:31 -0800 Subject: [PATCH] Fixup indent in async chunk io patch --- .../Asynchronous-chunk-IO-and-loading.patch | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/patches/server/Asynchronous-chunk-IO-and-loading.patch b/patches/server/Asynchronous-chunk-IO-and-loading.patch index c2d918946f..1f6aae1cfb 100644 --- a/patches/server/Asynchronous-chunk-IO-and-loading.patch +++ b/patches/server/Asynchronous-chunk-IO-and-loading.patch @@ -3029,9 +3029,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - return protochunk1; + return new InProgressChunkHolder(protochunk1, tasksToExecuteOnMain); // Paper - Async chunk loading - } - } - ++ } ++ } ++ + // Paper start - async chunk save for unload + public record AsyncSaveData( + DataLayer[] blockLight, @@ -3077,7 +3077,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + if (blockEntityNbt != null) { + blockEntitiesSerialized.add(blockEntityNbt); + } -+ } + } + + return new AsyncSaveData( + blockLight, @@ -3087,15 +3087,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + blockEntitiesSerialized, + world.getGameTime() + ); -+ } -+ + } ++ // Paper end + private static void logErrors(ChunkPos chunkPos, int y, String message) { ChunkSerializer.LOGGER.error("Recoverable errors when loading section [" + chunkPos.x + ", " + y + ", " + chunkPos.z + "]: " + message); - } @@ -0,0 +0,0 @@ public class ChunkSerializer { } public static CompoundTag write(ServerLevel world, ChunkAccess chunk) { ++ // Paper start + return saveChunk(world, chunk, null); + } + public static CompoundTag saveChunk(ServerLevel world, ChunkAccess chunk, @org.checkerframework.checker.nullness.qual.Nullable AsyncSaveData asyncsavedata) {