Merge branch 'master' into 1.17

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()