From 7cfc65010f9eb3a5f8f3b4145e918fa8f2419f8f Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 8 Aug 2019 20:30:09 +0200 Subject: [PATCH] Fix that aircraft with TakeOffOnResupply can't force-land --- OpenRA.Mods.Common/Traits/Air/Aircraft.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Air/Aircraft.cs b/OpenRA.Mods.Common/Traits/Air/Aircraft.cs index 7be7f966e2..37b958d99c 100644 --- a/OpenRA.Mods.Common/Traits/Air/Aircraft.cs +++ b/OpenRA.Mods.Common/Traits/Air/Aircraft.cs @@ -928,7 +928,7 @@ namespace OpenRA.Mods.Common.Traits { yield return new EnterAlliedActorTargeter("ForceEnter", 6, (target, modifiers) => Info.CanForceLand && modifiers.HasModifier(TargetModifiers.ForceMove) && AircraftCanEnter(target), - target => Reservable.IsAvailableFor(target, self) && AircraftCanResupplyAt(target, !Info.TakeOffOnResupply)); + target => Reservable.IsAvailableFor(target, self) && AircraftCanResupplyAt(target, true)); yield return new EnterAlliedActorTargeter("Enter", 5, AircraftCanEnter, target => Reservable.IsAvailableFor(target, self) && AircraftCanResupplyAt(target)); @@ -1019,7 +1019,7 @@ namespace OpenRA.Mods.Common.Traits var targetActor = order.Target.Actor; var isForceEnter = orderString == "ForceEnter"; - var canResupplyAt = AircraftCanResupplyAt(targetActor, isForceEnter && !Info.TakeOffOnResupply); + var canResupplyAt = AircraftCanResupplyAt(targetActor, isForceEnter || !Info.TakeOffOnResupply); // This is what the order targeter checks to display the correct cursor, so we need to make sure // the behavior matches the cursor if the player clicks despite a "blocked" cursor.