Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	Moose Development/Moose/Ops/PlayerTask.lua
This commit is contained in:
Applevangelist 2022-10-31 08:06:10 +01:00
commit 2925e0b8e3

View File

@ -1959,7 +1959,7 @@ function FLIGHTGROUP:onafterArrived(From, Event, To)
end
--TODO: Check that current base is airwing base.
local airwing=self:GetAirWing() --airwing:GetAirbaseName()==self.currbase:GetName()
local airwing=self:GetAirwing() --airwing:GetAirbaseName()==self.currbase:GetName()
-- Check what to do.
if airwing and not (self:IsPickingup() or self:IsTransporting()) then