Don't show save-load screen when multiplayer installed.

SamboyCoding · Jul 24, 2021 · d423139 · d423139
1 parent 11f12c4
commit d423139
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git a/1.1-1.2/Assemblies/BetterLoading.dll b/1.1-1.2/Assemblies/BetterLoading.dll
diff --git a/1.3/Assemblies/BetterLoading.dll b/1.3/Assemblies/BetterLoading.dll
diff --git a/About/Manifest.xml b/About/Manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
     <identifier>BetterLoading</identifier>
-    <version>3.2.0.0</version>
+    <version>3.2.0.1</version>
     <loadBefore>
         <li>Core &gt;= 1.0</li>
         <li>Startupimpact</li>

diff --git a/Source/BetterLoadingMain.cs b/Source/BetterLoadingMain.cs
@@ -294,6 +294,13 @@ public static bool DisableVanillaLoadScreen()
 
         public static void OnGameLoadStart()
         {
+            if (ModLister.AllInstalledMods.FirstOrDefault(m => m.enabled && m.Name.ToLowerInvariant().Contains("multiplayer")) is {} mpMod)
+            {
+                Log.Warning($"[BetterLoading] Not showing game load/save screen because we've detected what we believe to be a multiplayer mod: {mpMod.Name}");
+                return;
+            }
+
+
             LoadingScreen = Object.FindObjectOfType<Root_Play>().gameObject
                 .AddComponent<LoadingScreen>();
             InitLoadingScreenBG();

diff --git a/Source/Stage/InitialLoad/7StageRunPostLoadPreFinalizeCallbacks.cs b/Source/Stage/InitialLoad/7StageRunPostLoadPreFinalizeCallbacks.cs
@@ -139,7 +139,7 @@ public static bool PreExecToExecWhenFinished(List<Action> ___toExecuteWhenFinish
 
                 while (!_finishedExecuting)
                 {
-                    Thread.Sleep(2000); //Wait
+                    Thread.Sleep(200); //Wait
                 }
 
                 Log.Message($"[BetterLoading] Obtained synclock, assuming post-load actions are complete and starting static constructors.");