Possible fix for #14102: Consider airfield available if already reserved for the same actor

This commit is contained in:
portablestew
2019-01-11 20:46:11 -08:00
committed by reaperrr
parent f9cf45e634
commit a49287cc97
4 changed files with 12 additions and 6 deletions

View File

@@ -49,13 +49,13 @@ namespace OpenRA.Mods.Common.Activities
return self.World.ActorsHavingTrait<Reservable>()
.Where(a => a.Owner == self.Owner
&& rearmInfo.RearmActors.Contains(a.Info.Name)
&& (!unreservedOnly || !Reservable.IsReserved(a)))
&& (!unreservedOnly || Reservable.IsAvailableFor(a, self)))
.ClosestTo(self);
}
void Calculate(Actor self)
{
if (dest == null || dest.IsDead || Reservable.IsReserved(dest))
if (dest == null || dest.IsDead || !Reservable.IsAvailableFor(dest, self))
dest = ChooseResupplier(self, true);
if (dest == null)