Fixes for spawnpoint loading exceptions

overload-development-community · Mar 15, 2024 · cbe34a1 · cbe34a1
1 parent 355919b
commit cbe34a1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/GameMod/MPSpawnExtension.cs b/GameMod/MPSpawnExtension.cs
@@ -15,6 +15,7 @@ namespace GameMod
     public static class MPSpawnExtension
     {
         const string BASE_URL = "https://raw.githubusercontent.com/overload-development-community/ol-map-revisions/main/spawnpoints/";
+        //const string BASE_URL = "https://raw.githubusercontent.com/CCraigen/ol-map-revisions/main/spawnpoints/"; // testing repo
 
         public static List<LevelData.SpawnPoint> spawnpoints = new List<LevelData.SpawnPoint>();
         public static bool DownloadBusy = false;
@@ -35,7 +36,7 @@ public static void ResetForNewLevel()
 
         public static void CheckExtraSpawnpoints(string name)
         {
-            if (!GameplayManager.IsMultiplayer || DownloadChecked)
+            if (DownloadChecked || !(GameplayManager.IsDedicatedServer() || GameplayManager.IsMultiplayer))
             {
                 return;
             }

diff --git a/GameMod/MPTweaks.cs b/GameMod/MPTweaks.cs
@@ -160,7 +160,7 @@ class MPTweaksLoadScene
     {
         private static void Postfix()
         {
-            if (!GameplayManager.IsDedicatedServer())
+            if (MPDownloadLevel.DownloadBusy || MPSpawnExtension.DownloadBusy || !GameplayManager.IsDedicatedServer())
                 return;
             Debug.Log("MPTweaksLoadScene");
             RobotManager.ReadMultiplayerModeFile();