From ac2bfd98cdfc10540eada52eedf281a02f31b69f Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 11 Jan 2025 13:36:47 -0600 Subject: [PATCH] fix rare columnRenderBuffer future nullpointer --- .../render/bufferBuilding/ColumnRenderBuffer.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnRenderBuffer.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnRenderBuffer.java index 573abd397..823f47542 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnRenderBuffer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnRenderBuffer.java @@ -88,9 +88,13 @@ public class ColumnRenderBuffer implements AutoCloseable CompletableFuture future = this.uploadFuture; if (future != null) { + // upload already in process return future; } - this.uploadFuture = new CompletableFuture<>(); + + // new upload needed + future = new CompletableFuture<>(); + this.uploadFuture = future; @@ -150,7 +154,7 @@ public class ColumnRenderBuffer implements AutoCloseable } }); - return this.uploadFuture; + return future; } private static GLVertexBuffer[] resizeBuffer(GLVertexBuffer[] vbos, int newSize) {