Merge pull request #146 from prism/fix/shutdown-exception

Fix NullPointerException on Shutdown
darkhelmet-gaming · Sep 3, 2019 · 49879a1 · 49879a1
2 parents 9cb5fdd + bfbd0fe
commit 49879a1
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/main/java/com/helion3/prism/Prism.java b/src/main/java/com/helion3/prism/Prism.java
@@ -216,12 +216,14 @@ public void onStoppedServer(GameStoppedServerEvent event) {
         // Cancel all scheduled tasks
         Sponge.getScheduler().getScheduledTasks(getInstance()).forEach(Task::cancel);
 
-        // Flush any pending records
-        // If the scheduled task is still running this will block until it completes
-        recordingQueueManager.run();
+        if (getStorageAdapter() != null) {
+            // Flush any pending records
+            // If the scheduled task is still running this will block until it completes
+            recordingQueueManager.run();
 
-        // Shutdown storage
-        getStorageAdapter().close();
+            // Shutdown storage
+            getStorageAdapter().close();
+        }
     }
 
     public static Prism getInstance() {