diff --git a/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs b/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs index 0de73d17a3..1432bef861 100644 --- a/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs +++ b/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs @@ -14,7 +14,6 @@ using System.Collections.Generic; using System.Linq; using OpenRA.Activities; using OpenRA.Mods.Common.Activities; -using OpenRA.Mods.Common.Warheads; using OpenRA.Primitives; using OpenRA.Traits; @@ -177,8 +176,7 @@ namespace OpenRA.Mods.Common.Traits if (IsTraitDisabled) yield break; - var armament = Armaments.FirstOrDefault(a => a.Weapon.Warheads.Any(w => (w is DamageWarhead))); - if (armament == null) + if (!Armaments.Any()) yield break; yield return new AttackOrderTargeter(this, 6);