fix: add try-finally to server stopping

AllayMC · Mar 8, 2024 · 08b1672 · 08b1672
1 parent 2526e8b
commit 08b1672
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/Allay-Server/src/main/java/org/allaymc/server/AllayServer.java b/Allay-Server/src/main/java/org/allaymc/server/AllayServer.java
@@ -234,12 +234,15 @@ public void shutdown() {
         scoreboardService.save();
         // Start a thread to handle server shutdown
         Thread.ofPlatform().start(() -> {
-            kickAllPlayersAndBlock();
-            isRunning.compareAndSet(true, false);
-            worldPool.close();
-            playerStorage.close();
-            virtualThreadPool.shutdownNow();
-            computeThreadPool.shutdownNow();
+            try {
+                kickAllPlayersAndBlock();
+            } finally {
+                isRunning.compareAndSet(true, false);
+                worldPool.close();
+                playerStorage.close();
+                virtualThreadPool.shutdownNow();
+                computeThreadPool.shutdownNow();
+            }
             System.exit(0);
         });
     }