Fix: Soft Crash when A Dyson Swarm Controller is destroyed.

TeamStarDrive · Oct 12, 2024 · c042b30 · c042b30
1 parent 61a4138
commit c042b30
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/Ship_Game/Universe/SolarBodies/DysonSwarm.cs b/Ship_Game/Universe/SolarBodies/DysonSwarm.cs
@@ -94,17 +94,21 @@ void AddControllerPositions(int numPerRing, int distance)
         public void Update() // Once per turn or when a new Dyson Swarm Sat is deployed
         {
             int count = 0;
+            List<Vector2> keysToUpdate = new List<Vector2>();
             foreach (KeyValuePair<Vector2, Ship> item in SwarmControllers)
             {
                 Ship swarmController = item.Value;
                 if (swarmController != null)
                 {
-                    if      (!swarmController.Active)          SwarmControllers[item.Key] = null;
+                    if      (!swarmController.Active)           keysToUpdate.Add(item.Key);
                     else if (swarmController.Loyalty != Owner) swarmController.AI.OrderScuttleShip();
                     else                                       count++;
                 }
             }
 
+            for (int i = 0; i < keysToUpdate.Count; i++)
+                SwarmControllers[keysToUpdate[i]] = null;
+
             UpdateMaxOverclock();
             ControllerCompletion = count / (float)TotalSwarmControllers;
             int desiredOverclock = OverclockEnabled ? MaxOverclock : 0;