Fix attack behaviour of disabled units

OpenRA · Mar 7, 2019 · a6da7fb · a6da7fb
1 parent be741ce
commit a6da7fb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs b/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
@@ -124,7 +124,7 @@ protected virtual bool CanAttack(Actor self, Target target)
 
 		public virtual void DoAttack(Actor self, Target target, IEnumerable<Armament> armaments = null)
 		{
-			if (armaments == null && !CanAttack(self, target))
+			if (!CanAttack(self, target))
 				return;
 
 			foreach (var a in armaments ?? Armaments)
@@ -350,7 +350,7 @@ public IEnumerable<Armament> ChooseArmamentsForTarget(Target t, bool forceAttack
 
 		public void AttackTarget(Target target, bool queued, bool allowMove, bool forceAttack = false)
 		{
-			if (IsTraitDisabled || IsTraitPaused)
+			if (IsTraitDisabled)
 				return;
 
 			if (!target.IsValidFor(self))