epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix double-revoke crash in Demolishable.

Browse Source
This commit is contained in:
Paul Chote
2019-02-02 22:33:03 +00:00
committed by reaperrr
parent 0a57fbda3c
commit 2194f17dc2
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Traits/Demolishable.cs
View File

@@ -45,6 +45,7 @@ namespace OpenRA.Mods.Common.Traits
ConditionManager conditionManager; ConditionManager conditionManager;
List<DemolishAction> actions = new List<DemolishAction>(); List<DemolishAction> actions = new List<DemolishAction>();
List<DemolishAction> removeActions = new List<DemolishAction>();
public Demolishable(DemolishableInfo info) public Demolishable(DemolishableInfo info)
: base(info) { } : base(info) { }
@@ -88,9 +89,18 @@ namespace OpenRA.Mods.Common.Traits
if (Util.ApplyPercentageModifiers(100, modifiers) > 0) if (Util.ApplyPercentageModifiers(100, modifiers) > 0)
self.Kill(a.Saboteur); self.Kill(a.Saboteur);
else if (a.Token != ConditionManager.InvalidConditionToken) else if (a.Token != ConditionManager.InvalidConditionToken)
{
conditionManager.RevokeCondition(self, a.Token); 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();
}
} }
} }