Merge branch 'develop' into FF/Develop

This commit is contained in:
Frank
2018-09-26 22:36:52 +02:00
3 changed files with 6 additions and 4 deletions

View File

@@ -297,7 +297,7 @@ do -- CARGO_UNIT
if CargoCarrier and CargoCarrier:IsAlive() and self.CargoObject and self.CargoObject:IsAlive() then
if (CargoCarrier:IsAir() and not CargoCarrier:InAir()) or true then
local NearRadius = CargoCarrier:GetBoundingRadius( NearRadius ) + 5
local NearRadius = NearRadius or CargoCarrier:GetBoundingRadius( NearRadius ) + 5
if self:IsNear( CargoCarrier:GetPointVec2(), NearRadius ) then
self:__Load( 1, CargoCarrier, ... )
else