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

Use .Trait<ConditionManager>(); on GrantConditionOnDamageState

Browse Source
This commit is contained in:
Mustafa Alperen Seki
2019-03-15 11:46:23 +03:00
committed by reaperrr
parent d54e4395e5
commit ac7d2e00e3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnDamageState.cs
View File

@@ -52,7 +52,7 @@ namespace OpenRA.Mods.Common.Traits
void INotifyCreated.Created(Actor self)
{
conditionManager = self.TraitOrDefault<ConditionManager>();
conditionManager = self.Trait<ConditionManager>();
GrantConditionOnValidDamageState(self, health.DamageState);
}
@@ -70,7 +70,7 @@ namespace OpenRA.Mods.Common.Traits
void INotifyDamageStateChanged.DamageStateChanged(Actor self, AttackInfo e)
{
var granted = conditionToken != ConditionManager.InvalidConditionToken;
if ((granted && info.GrantPermanently) || conditionManager == null)
if (granted && info.GrantPermanently)
return;
if (!granted && !info.ValidDamageStates.HasFlag(e.PreviousDamageState))