Make Attack* traits PausableConditional and replace IsDisabled with IsTraitDisabled checks

2017-10-17 16:38:25 +02:00
parent 68487d1197
commit 456d32f3eb
2 changed files with 5 additions and 5 deletions
--- a/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs
+++ b/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs
@@ -84,7 +84,7 @@ namespace OpenRA.Mods.Common.Traits
 				if (IsCanceled || !target.IsValidFor(self))
 					return NextActivity;

-				if (self.IsDisabled())
+				if (attack.IsTraitPaused)
 					return this;

 				var weapon = attack.ChooseArmamentsForTarget(target, forceAttack).FirstOrDefault();