From 393bd84ca89e7e2aaa9b7f051da05a84d4c0832d Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Wed, 19 Jun 2024 08:18:58 -0700 Subject: [PATCH] Null check onComplete parameter for scheduleChunkLoad with gen = false When gen = true, the parameter may be null. There is no reason it should NPE then when gen = false. --- .../chunk_system/scheduling/ChunkTaskScheduler.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkTaskScheduler.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkTaskScheduler.java index 86707580..786d322f 100644 --- a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkTaskScheduler.java +++ b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkTaskScheduler.java @@ -457,12 +457,16 @@ public void scheduleChunkLoad(final int chunkX, final int chunkZ, final boolean } this.scheduleChunkLoad(chunkX, chunkZ, ChunkStatus.EMPTY, addTicket, priority, (final ChunkAccess chunk) -> { if (chunk == null) { - onComplete.accept(null); + if (onComplete != null) { + onComplete.accept(null); + } } else { if (chunk.getPersistedStatus().isOrAfter(toStatus)) { this.scheduleChunkLoad(chunkX, chunkZ, toStatus, addTicket, priority, onComplete); } else { - onComplete.accept(null); + if (onComplete != null) { + onComplete.accept(null); + } } } });