From 0c8135644949a6a703d4504daa75295c31f8b7de Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sat, 1 May 2010 14:51:56 +1200 Subject: [PATCH] fix TSLA firing in low power or disabled --- OpenRA.Game/Traits/Attack/AttackBase.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OpenRA.Game/Traits/Attack/AttackBase.cs b/OpenRA.Game/Traits/Attack/AttackBase.cs index 2d03b67882..d2d4ed8afb 100755 --- a/OpenRA.Game/Traits/Attack/AttackBase.cs +++ b/OpenRA.Game/Traits/Attack/AttackBase.cs @@ -69,8 +69,9 @@ namespace OpenRA.Traits protected virtual bool CanAttack(Actor self) { - if( target == null ) return false; - if( ( primaryFireDelay > 0 ) && ( secondaryFireDelay > 0 ) ) return false; + if (target == null) return false; + if ((primaryFireDelay > 0) && (secondaryFireDelay > 0)) return false; + if (self.traits.WithInterface().Any(d => d.Disabled)) return false; return true; }