Fix double-revoke crash in Demolishable.

OpenRA · Feb 3, 2019 · 93cef02 · 93cef02
1 parent a641ac0
commit 93cef02
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/OpenRA.Mods.Common/Traits/Demolishable.cs b/OpenRA.Mods.Common/Traits/Demolishable.cs
@@ -45,6 +45,7 @@ public DemolishAction(Actor saboteur, int delay, int token)
 
 		ConditionManager conditionManager;
 		List<DemolishAction> actions = new List<DemolishAction>();
+		List<DemolishAction> removeActions = new List<DemolishAction>();
 
 		public Demolishable(DemolishableInfo info)
 			: base(info) { }
@@ -88,9 +89,18 @@ void ITick.Tick(Actor self)
 					if (Util.ApplyPercentageModifiers(100, modifiers) > 0)
 						self.Kill(a.Saboteur);
 					else if (a.Token != ConditionManager.InvalidConditionToken)
+					{
 						conditionManager.RevokeCondition(self, a.Token);
+						removeActions.Add(a);
+					}
 				}
 			}
+
+			// Remove expired actions to avoid double-revoking
+			foreach (var a in removeActions)
+				actions.Remove(a);
+
+			removeActions.Clear();
 		}
 	}
 }