From ac7d2e00e3a7fe319339a8ada814209e4f7ffa87 Mon Sep 17 00:00:00 2001 From: Mustafa Alperen Seki Date: Fri, 15 Mar 2019 11:46:23 +0300 Subject: [PATCH] Use .Trait(); on GrantConditionOnDamageState --- .../Traits/Conditions/GrantConditionOnDamageState.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnDamageState.cs b/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnDamageState.cs index 448be6a959..5e889b1fec 100644 --- a/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnDamageState.cs +++ b/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnDamageState.cs @@ -52,7 +52,7 @@ namespace OpenRA.Mods.Common.Traits void INotifyCreated.Created(Actor self) { - conditionManager = self.TraitOrDefault(); + conditionManager = self.Trait(); 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))