check for valid targets when flying

closes #4972
2014-03-31 13:23:59 +02:00
parent c4b28b9016
commit c7ed2aacaf
2 changed files with 2 additions and 2 deletions
--- a/OpenRA.Mods.RA/Air/Fly.cs
+++ b/OpenRA.Mods.RA/Air/Fly.cs
@@ -52,7 +52,7 @@ namespace OpenRA.Mods.RA.Air

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

 			// Inside the target annulus, so we're done
--- a/OpenRA.Mods.RA/Air/HeliFly.cs
+++ b/OpenRA.Mods.RA/Air/HeliFly.cs
@@ -48,7 +48,7 @@ namespace OpenRA.Mods.RA.Air

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

 			if (AdjustAltitude(self, helicopter, helicopter.Info.CruiseAltitude))