Merge branch 'master' into 1.17

src/main/java/carpet/CarpetServer.java

@@ -114,7 +114,7 @@ public class CarpetServer implements ClientModInitializer,DedicatedServerModInit
     {
         TickSpeed.tick();
         HUDController.update_hud(server, null);
-        scriptServer.tick();
+        if (scriptServer != null) scriptServer.tick();
 
         //in case something happens
         CarpetSettings.impendingFillSkipUpdates.set(false);
@@ -168,6 +168,12 @@ public class CarpetServer implements ClientModInitializer,DedicatedServerModInit
         extensions.forEach(e -> e.onPlayerLoggedOut(player));
     }
 
+    public static void clientPreClosing()
+    {
+        if (scriptServer != null) scriptServer.onClose();
+        scriptServer = null;
+    }
+
     public static void onServerClosed(MinecraftServer server)
     {
         // this for whatever reason gets called multiple times even when joining on SP
@@ -175,6 +181,7 @@ public class CarpetServer implements ClientModInitializer,DedicatedServerModInit
         if (minecraft_server != null)
         {
             if (scriptServer != null) scriptServer.onClose();
+            scriptServer = null;
             ServerNetworkHandler.close();
             currentCommandDispatcher = null;
 

src/main/java/carpet/network/CarpetClient.java

@@ -37,13 +37,17 @@ public class CarpetClient
 
     public static void disconnect()
     {
-        if (isServerCarpet)
+        if (isServerCarpet) // multiplayer connection
         {
             isServerCarpet = false;
             clientPlayer = null;
             CarpetServer.onServerClosed(null);
             CarpetServer.onServerDoneClosing(null);
         }
+        else // singleplayer disconnect
+        {
+            CarpetServer.clientPreClosing();
+        }
     }
 
     public static void setCarpet()