fix potential crash. Fixes #2041

gnembon · Feb 26, 2025 · ac72645 · ac72645
1 parent d5ef0a8
commit ac72645
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/carpet/CarpetServer.java b/src/main/java/carpet/CarpetServer.java
@@ -40,6 +40,8 @@
 import net.minecraft.server.commands.PerfCommand;
 import net.minecraft.server.level.ServerPlayer;
 
+import javax.annotation.Nullable;
+
 public class CarpetServer // static for now - easier to handle all around the code, its one anyways
 {
     public static MinecraftServer minecraft_server;
@@ -172,15 +174,15 @@ public static void clientPreClosing()
         scriptServer = null;
     }
 
-    public static void onServerClosed(MinecraftServer server)
+    public static void onServerClosed(@Nullable MinecraftServer server)
     {
         // this for whatever reason gets called multiple times even when joining on SP
         // so we allow to pass multiple times gating it only on existing server ref
         if (minecraft_server != null)
         {
             if (scriptServer != null) scriptServer.onClose();
             // this is a mess, will cleanip onlly when global reference is gone
-            if (!Vanilla.MinecraftServer_getScriptServer(server).stopAll) {
+            if (server != null && !Vanilla.MinecraftServer_getScriptServer(server).stopAll) {
                 Vanilla.MinecraftServer_getScriptServer(server).onClose();
             }