From 3aa8b3ae29401ca8925719963ae5475ea238f745 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Sun, 19 Nov 2017 17:24:36 +0100
Subject: [PATCH] Remove unit.IsDisabled check from AirStates

---
 OpenRA.Mods.Common/AI/States/AirStates.cs | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/OpenRA.Mods.Common/AI/States/AirStates.cs b/OpenRA.Mods.Common/AI/States/AirStates.cs
index 17c32f2fc3..413655ea78 100644
--- a/OpenRA.Mods.Common/AI/States/AirStates.cs
+++ b/OpenRA.Mods.Common/AI/States/AirStates.cs
@@ -31,17 +31,19 @@ namespace OpenRA.Mods.Common.AI
 			var missileUnitsCount = 0;
 			foreach (var unit in units)
 			{
-				if (unit != null && unit.Info.HasTraitInfo<AttackBaseInfo>() && !unit.Info.HasTraitInfo<AircraftInfo>()
-					&& !unit.IsDisabled())
+				if (unit == null || unit.Info.HasTraitInfo<AircraftInfo>())
+					continue;
+
+				var arms = unit.TraitsImplementing<AttackBase>()
+					.Where(ab => !ab.IsTraitPaused && !ab.IsTraitDisabled)
+					.SelectMany(ab => ab.Armaments);
+
+				foreach (var a in arms)
 				{
-					var arms = unit.TraitsImplementing<Armament>();
-					foreach (var a in arms)
+					if (a.Weapon.IsValidTarget(AirTargetTypes))
 					{
-						if (a.Weapon.IsValidTarget(AirTargetTypes))
-						{
-							missileUnitsCount++;
-							break;
-						}
+						missileUnitsCount++;
+						break;
 					}
 				}
 			}