Added try catch to catch rare case of player not being in sandbox fil…

…e OR gps being deleted before loading.
thorwin99 · Jul 10, 2022 · e9ab7f6 · e9ab7f6
1 parent 29db853
commit e9ab7f6
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/SEWorldGenPlugin/Session/MyGPSManager.cs b/SEWorldGenPlugin/Session/MyGPSManager.cs
@@ -299,12 +299,23 @@ public override void UpdateBeforeSimulation()
                 {
                     foreach (var gps in player.DynamicGpss)
                     {
-                        var collection = MySession.Static.Gpss[player.PlayerId];
-                        var mgps = collection[gps.Hash];
+                        try
+                        {
+                            var collection = MySession.Static.Gpss[player.PlayerId];
+
+                            if (collection == null) continue;
+
+                            var mgps = collection[gps.Hash];
 
-                        if (mgps == null) continue;
+                            if (mgps == null) continue;
 
-                        m_dynamicGpss.Add(new MyDynamicGpsId(gps.ID, player.PlayerId), mgps);
+                            m_dynamicGpss.Add(new MyDynamicGpsId(gps.ID, player.PlayerId), mgps);
+                        }
+                        catch (KeyNotFoundException)
+                        {
+                            MyPluginLog.Log("Could not load dynamic GPS " + gps.ID + " for player " + player.PlayerId, LogLevel.ERROR);
+                            continue;
+                        }
                     }
                 }
                 loadedDynamicGpss = true;