diff --git a/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs b/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs index 1fb212cd4c..6924ceb671 100644 --- a/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs +++ b/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs @@ -47,7 +47,8 @@ namespace OpenRA.Mods.Common.Activities return null; return self.World.ActorsHavingTrait() - .Where(a => a.Owner == self.Owner + .Where(a => !a.IsDead + && a.Owner == self.Owner && rearmInfo.RearmActors.Contains(a.Info.Name) && (!unreservedOnly || Reservable.IsAvailableFor(a, self))) .ClosestTo(self);