epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix LandOnCondition causing stopping after changing altitude.

Browse Source
This commit is contained in:
Mustafa Alperen Seki
2018-12-19 17:12:21 +03:00
committed by reaperrr
parent 2a2ad71db9
commit 00faccdecc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Traits/Air/Aircraft.cs
View File

@@ -292,7 +292,7 @@ namespace OpenRA.Mods.Common.Traits
} }
// Add land activity if LandOnCondidion resolves to true and the actor can land at the current location. // Add land activity if LandOnCondidion resolves to true and the actor can land at the current location.
if (landNow.HasValue && landNow.Value && airborne && CanLand(self.Location) if (!ForceLanding && landNow.HasValue && landNow.Value && airborne && CanLand(self.Location)
&& !(self.CurrentActivity is HeliLand || self.CurrentActivity is Turn)) && !(self.CurrentActivity is HeliLand || self.CurrentActivity is Turn))
{ {
self.CancelActivity(); self.CancelActivity();
@@ -306,7 +306,7 @@ namespace OpenRA.Mods.Common.Traits
} }
// Add takeoff activity if LandOnCondidion resolves to false and the actor should not land when idle. // Add takeoff activity if LandOnCondidion resolves to false and the actor should not land when idle.
if (landNow.HasValue && !landNow.Value && !cruising && !(self.CurrentActivity is TakeOff)) if (ForceLanding && landNow.HasValue && !landNow.Value && !cruising && !(self.CurrentActivity is TakeOff))
{ {
ForceLanding = false; ForceLanding = false;