Consider disabled armaments invalid

This commit is contained in:
reaperrr
2017-08-17 15:36:05 +02:00
committed by Paul Chote
parent 28e28bf34c
commit 951ee2210c

View File

@@ -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;
}