From 395112fc4027c740c81fc525cf7ea9fc8a691993 Mon Sep 17 00:00:00 2001
From: mcrcortex <18544518+MCRcortex@users.noreply.github.com>
Date: Wed, 7 Aug 2024 02:01:22 +1000
Subject: [PATCH] A

---
 .../me/cortex/voxy/client/importers/WorldImporter.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/me/cortex/voxy/client/importers/WorldImporter.java b/src/main/java/me/cortex/voxy/client/importers/WorldImporter.java
index 67c63d3e..f21040fd 100644
--- a/src/main/java/me/cortex/voxy/client/importers/WorldImporter.java
+++ b/src/main/java/me/cortex/voxy/client/importers/WorldImporter.java
@@ -112,7 +112,13 @@ public class WorldImporter {
 
     public void shutdown() {
         this.isRunning = false;
-        try {this.worker.join();} catch (InterruptedException e) {throw new RuntimeException(e);}
+        if (this.worker != null) {
+            try {
+                this.worker.join();
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
         this.threadPool.shutdown();
     }