Check ITargetable when deciding target validity. Fixes #3659.

2013-08-18 17:15:22 +12:00
parent 8fd4243861
commit bc5c11e44f
26 changed files with 62 additions and 44 deletions
--- a/OpenRA.Mods.RA/Activities/Enter.cs
+++ b/OpenRA.Mods.RA/Activities/Enter.cs
@@ -27,7 +27,10 @@ namespace OpenRA.Mods.RA.Activities

 		public override Activity Tick(Actor self)
 		{
-			if (IsCanceled || target.Type != TargetType.Actor)
+			if (IsCanceled || !target.IsValidFor(self))
+				return NextActivity;
+
+			if (target.Type != TargetType.Actor)
 				return NextActivity;

 			if (!Util.AdjacentCells(target).Any(c => c == self.Location))