Merge pull request #7544 from delftswa2014/bugfix/sam_site_friendlyfire

Friendly fire fixes and sam sites
2015-03-08 16:16:14 +01:00
parent a39352aee3 17fec82348
commit 190d197613
5 changed files with 15 additions and 8 deletions
--- a/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
+++ b/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
@@ -164,6 +164,9 @@ namespace OpenRA.Mods.Common.Traits

 		public void AttackTarget(Target target, bool queued, bool allowMove)
 		{
+			if (self.IsDisabled())
+				return;
+
 			if (!target.IsValidFor(self))
 				return;