Fix world closing (#4327)

FabricMC · Dec 26, 2024 · cdad5be · cdad5be
1 parent c6322ff
commit cdad5be
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/...v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/TestServerConnectionImpl.java b/...v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/TestServerConnectionImpl.java
@@ -16,7 +16,6 @@
 
 package net.fabricmc.fabric.impl.client.gametest;
 
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.TitleScreen;
 
 import net.fabricmc.fabric.api.client.gametest.v1.ClientGameTestContext;
@@ -45,9 +44,11 @@ public void close() {
 			if (client.world == null) {
 				throw new AssertionError("Disconnected from server before closing the test server connection");
 			}
+
+			client.world.disconnect();
+			client.disconnect();
 		});
 
-		context.runOnClient(MinecraftClient::disconnect);
 		context.waitFor(client -> client.world == null);
 		context.setScreen(TitleScreen::new);
 	}

diff --git a/...src/client/java/net/fabricmc/fabric/impl/client/gametest/TestSingleplayerContextImpl.java b/...src/client/java/net/fabricmc/fabric/impl/client/gametest/TestSingleplayerContextImpl.java
@@ -17,9 +17,10 @@
 package net.fabricmc.fabric.impl.client.gametest;
 
 import net.minecraft.SharedConstants;
-import net.minecraft.client.gui.screen.GameMenuScreen;
+import net.minecraft.client.gui.screen.MessageScreen;
 import net.minecraft.client.gui.screen.TitleScreen;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.text.Text;
 
 import net.fabricmc.fabric.api.client.gametest.v1.ClientGameTestContext;
 import net.fabricmc.fabric.api.client.gametest.v1.TestClientWorldContext;
@@ -63,11 +64,12 @@ public void close() {
 			if (client.world == null) {
 				throw new IllegalStateException("Exited the world before closing singleplayer context");
 			}
+
+			client.world.disconnect();
+			client.disconnect(new MessageScreen(Text.translatable("menu.savingLevel")));
 		});
 
-		context.setScreen(() -> new GameMenuScreen(true));
-		context.clickScreenButton("menu.returnToMenu");
-		context.waitForScreen(TitleScreen.class);
 		context.waitFor(client -> !ThreadingImpl.isServerRunning && client.world == null, SharedConstants.TICKS_PER_MINUTE);
+		context.setScreen(TitleScreen::new);
 	}
 }