From ea641f081f959b9dc76dbfe6dc20de935b6d3c5d Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Fri, 14 Sep 2012 23:20:18 +1200 Subject: [PATCH] use ChooseAirfield in ReturnToBase.Tick bailout --- OpenRA.Mods.RA/Air/ReturnToBase.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/OpenRA.Mods.RA/Air/ReturnToBase.cs b/OpenRA.Mods.RA/Air/ReturnToBase.cs index 0fa24bdf0c..3891383786 100755 --- a/OpenRA.Mods.RA/Air/ReturnToBase.cs +++ b/OpenRA.Mods.RA/Air/ReturnToBase.cs @@ -94,11 +94,7 @@ namespace OpenRA.Mods.RA.Air Calculate(self); if (dest == null) { - var rearmBuildings = self.Info.Traits.Get().RearmBuildings; - var nearestAfld = self.World.ActorsWithTrait() - .Where(a => a.Actor.Owner == self.Owner && rearmBuildings.Contains(a.Actor.Info.Name)) - .Select(a => a.Actor) - .ClosestTo(self.CenterLocation); + var nearestAfld = ChooseAirfield(self, false); self.CancelActivity(); return Util.SequenceActivities(Fly.ToCell(nearestAfld.Location), new FlyCircle());