From 951ee2210c1d8ffbefff65d1696c463db247a0f3 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 17 Aug 2017 15:36:05 +0200 Subject: [PATCH] Consider disabled armaments invalid --- OpenRA.Mods.Common/Traits/Attack/AttackBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs b/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs index 7f2105b15e..2b59dbdbcc 100644 --- a/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs +++ b/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs @@ -210,7 +210,7 @@ namespace OpenRA.Mods.Common.Traits foreach (var armament in Armaments) { var checkIsValid = checkForCenterTargetingWeapons ? armament.Weapon.TargetActorCenter : !armament.OutOfAmmo; - if (checkIsValid && armament.Weapon.IsValidAgainst(t, self.World, self)) + if (checkIsValid && !armament.IsTraitDisabled && armament.Weapon.IsValidAgainst(t, self.World, self)) return true; }