From 08db7586d4b73a69b2ed2db3e1e29eebaefc7af0 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Mon, 12 Aug 2019 22:06:33 +0200 Subject: [PATCH] Fix Enter cursor for non-TakeOffOnResupply If the aircraft does not take off on resupply, we allow it to enter resuppliers without ForceMove modifier. ResolveOrder already handled this correctly, only the cursor shown was wrong. --- OpenRA.Mods.Common/Traits/Air/Aircraft.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenRA.Mods.Common/Traits/Air/Aircraft.cs b/OpenRA.Mods.Common/Traits/Air/Aircraft.cs index 1b2638ceb7..6b2d340ac5 100644 --- a/OpenRA.Mods.Common/Traits/Air/Aircraft.cs +++ b/OpenRA.Mods.Common/Traits/Air/Aircraft.cs @@ -931,7 +931,8 @@ namespace OpenRA.Mods.Common.Traits target => Reservable.IsAvailableFor(target, self) && AircraftCanResupplyAt(target, true)); yield return new EnterAlliedActorTargeter("Enter", 5, - AircraftCanEnter, target => Reservable.IsAvailableFor(target, self) && AircraftCanResupplyAt(target)); + AircraftCanEnter, + target => Reservable.IsAvailableFor(target, self) && AircraftCanResupplyAt(target, !Info.TakeOffOnResupply)); yield return new AircraftMoveOrderTargeter(this); }