Make AI StateBase.CanAttackTarget only return true on valid armaments…

… that are also enabled
OpenRA · Dec 2, 2017 · 3caab76 · 3caab76
1 parent 8e984b2
commit 3caab76
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/OpenRA.Mods.Common/AI/States/StateBase.cs b/OpenRA.Mods.Common/AI/States/StateBase.cs
@@ -70,8 +70,13 @@ protected static bool CanAttackTarget(Actor a, Actor target)
 
 			var arms = a.TraitsImplementing<Armament>();
 			foreach (var arm in arms)
+			{
+				if (arm.IsTraitDisabled)
+					continue;
+
 				if (arm.Weapon.IsValidTarget(targetTypes))
 					return true;
+			}
 
 			return false;
 		}