Merge pull request #3124 from Mailaender/zombie-aircraft-fix

Don't try to return to base if already dead
2013-04-20 16:55:04 -07:00
parent 5cead96550 6f681dfe37
commit c3000e90ef
1 changed files with 4 additions and 1 deletions
--- a/OpenRA.Mods.RA/Air/ReturnToBase.cs
+++ b/OpenRA.Mods.RA/Air/ReturnToBase.cs
@@ -93,7 +93,10 @@ namespace OpenRA.Mods.RA.Air

 		public override Activity Tick(Actor self)
 		{
-			if (IsCanceled) return NextActivity;
+			if (IsCanceled)
+				return NextActivity;
+			if (self.IsDead())
+				return NextActivity;
 			if (!isCalculated)
 				Calculate(self);
 			if (dest == null)