From 28ce32d8fa663b3b40ef1be8bcd8f23ab9efdee1 Mon Sep 17 00:00:00 2001 From: forcecore Date: Sat, 11 Feb 2017 18:40:33 -0600 Subject: [PATCH] damageDisabled removed from Cloak.cs (#12741) To unhard code uncloak behavior getting disabled by the unit's critical HP. --- OpenRA.Mods.Common/Traits/Cloak.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Cloak.cs b/OpenRA.Mods.Common/Traits/Cloak.cs index 028594bded..2facb3f929 100644 --- a/OpenRA.Mods.Common/Traits/Cloak.cs +++ b/OpenRA.Mods.Common/Traits/Cloak.cs @@ -64,7 +64,6 @@ namespace OpenRA.Mods.Common.Traits INotifyAttack, ITick, IVisibilityModifier, IRadarColorModifier, INotifyCreated, INotifyHarvesterAction { [Sync] int remainingTime; - [Sync] bool damageDisabled; bool isDocking; ConditionManager conditionManager; @@ -102,8 +101,7 @@ namespace OpenRA.Mods.Common.Traits void INotifyDamage.Damaged(Actor self, AttackInfo e) { - damageDisabled = e.DamageState >= DamageState.Critical; - if (damageDisabled || Info.UncloakOn.HasFlag(UncloakType.Damage)) + if (Info.UncloakOn.HasFlag(UncloakType.Damage)) Uncloak(); } @@ -128,7 +126,7 @@ namespace OpenRA.Mods.Common.Traits { if (!IsTraitDisabled) { - if (remainingTime > 0 && !damageDisabled && !isDocking) + if (remainingTime > 0 && !isDocking) remainingTime--; if (self.IsDisabled())