Merge pull request #3726 from pchote/cloak-fix

Cloak fixes
2013-08-23 09:27:56 -07:00
parent dce04c9d11 6e13cb7f3b
commit b5fcb297af
36 changed files with 135 additions and 132 deletions
--- a/OpenRA.Mods.RA/Activities/CaptureActor.cs
+++ b/OpenRA.Mods.RA/Activities/CaptureActor.cs
@@ -29,7 +29,7 @@ namespace OpenRA.Mods.RA.Activities

 			var capturable = target.Actor.Trait<Capturable>();

-			if (IsCanceled || !self.IsInWorld || self.IsDead())
+			if (IsCanceled || !self.IsInWorld || self.IsDead() || !target.IsValidFor(self))
 			{
 				if (capturable.CaptureInProgress)
 					capturable.EndCapture();