Fix #1230: crash when no hpad owned by player

This commit is contained in:
Curtis S
2011-10-23 14:53:33 -06:00
parent d9fbee6e01
commit f5807f5f3b

View File

@@ -37,10 +37,12 @@ namespace OpenRA.Mods.RA.Air
var nearestHpad = self.World.ActorsWithTrait<Reservable>()
.Where(a => a.Actor.Owner == self.Owner && rearmBuildings.Contains(a.Actor.Info.Name))
.Select(a => a.Actor)
.ClosestTo(self.CenterLocation);
self.CancelActivity();
return Util.SequenceActivities(new HeliFly(Util.CenterOfCell(nearestHpad.Location)));
.ClosestTo(self.CenterLocation);
if (nearestHpad == null)
return Util.SequenceActivities(new Turn(initialFacing), new HeliLand(true), NextActivity);
else
return Util.SequenceActivities(new HeliFly(Util.CenterOfCell(nearestHpad.Location)));
}
var res = dest.TraitOrDefault<Reservable>();