Merge pull request #170 from dnqbob/fix-sharedcrash

Fix possible crash in SharedCargoManager
MustaphaTR · Oct 23, 2024 · daf9a0b · daf9a0b
2 parents 2588691 + b6205c3
commit daf9a0b
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/OpenRA.Mods.AS/Traits/Player/SharedCargoManager.cs b/OpenRA.Mods.AS/Traits/Player/SharedCargoManager.cs
@@ -48,11 +48,14 @@ public SharedCargoManager(SharedCargoManagerInfo info)
 
 		public void Clear(AttackInfo e = null)
 		{
-			foreach (var passenger in Cargo)
+			for (var i = 0; i < Cargo.Count; i++)
+			{
+				var passenger = Cargo[i];
 				if (e != null)
 					passenger.Kill(e.Attacker, e.Damage.DamageTypes);
 				else
 					passenger.Dispose();
+			}
 
 			Cargo.Clear();
 			TotalWeight = 0;