From 4d39c90ba61afffde05b9dcbb34de422b3c2acd0 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Tue, 30 Jan 2024 12:27:58 -0500 Subject: [PATCH] Only return null if job is explicitly cancelled (#251) --- .../chunk/tasks/ChunkRenderRebuildTask.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/tasks/ChunkRenderRebuildTask.java b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/tasks/ChunkRenderRebuildTask.java index d008b5e84..6b240596b 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/tasks/ChunkRenderRebuildTask.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/tasks/ChunkRenderRebuildTask.java @@ -201,13 +201,15 @@ public class ChunkRenderRebuildTask extends ChunkR if(hasMainThreadBlocks) { // Render the other blocks on the main thread - try { - CompletableFuture.runAsync(() -> this.performMainBuild(cache, buffers, cancellationSource, bounds, renderData, mainThreadBlocks), AngelicaRenderQueue.executor()).get(); - } catch(InterruptedException e) { - Thread.currentThread().interrupt(); - return null; - } catch(ExecutionException e) { - throw new RuntimeException(e); + var future = CompletableFuture.runAsync(() -> this.performMainBuild(cache, buffers, cancellationSource, bounds, renderData, mainThreadBlocks), AngelicaRenderQueue.executor()); + while(!future.isDone() && !cancellationSource.isCancelled()) { + try { + future.get(); + } catch(InterruptedException e) { + // go around and check cancellation + } catch(ExecutionException e) { + throw new RuntimeException(e); + } } // Check if cancellation happened during that, so we don't render an incomplete chunk if(cancellationSource.isCancelled()) return null;