Fix deadlock when joining friend's world from singleplayer

Fixes #77
Gaming32 · May 30, 2024 · f9c6a5c · f9c6a5c
1 parent bf96acf
commit f9c6a5c
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/main/java/io/github/gaming32/worldhost/WorldHost.java b/src/main/java/io/github/gaming32/worldhost/WorldHost.java
@@ -694,6 +694,9 @@ public static void connect(Screen parentScreen, long cid) {
 
     public static void connect(Screen parentScreen, long cid, String host, int port) {
         final Minecraft minecraft = Minecraft.getInstance();
+        if (minecraft.getSingleplayerServer() != null) {
+            minecraft.getSingleplayerServer().halt(false);
+        }
         final ServerAddress serverAddress = new ServerAddress(host, port);
         ConnectScreen.startConnecting(
             parentScreen, minecraft, serverAddress,