.

megamek/unittests/megamek/client/BasicGameTest.java

@@ -26,6 +26,7 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 
 import java.io.File;
 import java.io.IOException;
@@ -41,6 +42,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
+@EnabledIfEnvironmentVariable(named = "ENABLE_TW_TESTS", matches = "true")
 public class BasicGameTest {
 
     private TWGameManager gameManager;
@@ -49,7 +51,6 @@ public class BasicGameTest {
     private Random random = new Random();
     private GameThread gameThread;
 
-    // autosave_2024-11-12_17-56-40.sav.gz
     private static Map<String, File> testSaves = Map.of(
         "one mek each", new File("testresources/data/scenarios/testbot/lounge_1x1_grasslands.sav.gz")
     );
@@ -79,9 +80,11 @@ public void tearDown() {
             server.die();
             server = null;
         }
-        gameThread.requestStop();
-        gameThread.die();
-        gameThread = null;
+        if (gameThread != null) {
+            gameThread.requestStop();
+            gameThread.die();
+            gameThread = null;
+        }
         gameManager = null;
     }
 

megamek/unittests/megamek/client/GameThread.java

@@ -175,14 +175,6 @@ private void connectToServer() {
         if (!server.loadGame(saveFile)) {
             throw new RuntimeException("Failed to load game");
         }
-        var gameOptions = server.getGame().getOptions();
-
-
-        Vector<IBasicOption> changed = new Vector<>();
-        var option = gameOptions.getOption(OptionsConstants.BASE_RNG_TYPE);
-        option.setValue(MMRandom.R_SEEDED);
-        changed.add(option);
-        sendAction(() -> watcher.sendGameOptions("", changed));
     }
 
     @Override