mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2025-10-29 16:58:06 +00:00
Merge remote-tracking branch 'origin/master' into branch
This commit is contained in:
commit
20fa78bc85
@ -289,7 +289,14 @@ do -- SET_BASE
|
||||
|
||||
-- Debug info.
|
||||
--self:T2( { ObjectName = ObjectName, Object = Object } )
|
||||
|
||||
|
||||
-- Error ahndling
|
||||
if not ObjectName or ObjectName == "" then
|
||||
self:E("SET_BASE:Add - Invalid ObjectName handed")
|
||||
self:E({ObjectName=ObjectName, Object=Object})
|
||||
return self
|
||||
end
|
||||
|
||||
-- Ensure that the existing element is removed from the Set before a new one is inserted to the Set
|
||||
if self.Set[ObjectName] then
|
||||
self:Remove( ObjectName, true )
|
||||
|
||||
@ -1933,7 +1933,7 @@ function RANGE:OnEventHit( EventData )
|
||||
local _currentTarget = self.strafeStatus[_unitID] --#RANGE.StrafeStatus
|
||||
|
||||
-- Player has rolled in on a strafing target.
|
||||
if _currentTarget and target:IsAlive() then
|
||||
if _currentTarget and target and target:IsAlive() then
|
||||
|
||||
local playerPos = _unit:GetCoordinate()
|
||||
local targetPos = target:GetCoordinate()
|
||||
|
||||
@ -607,7 +607,7 @@ function UNIT:GetSpeedMax()
|
||||
local Desc = self:GetDesc()
|
||||
|
||||
if Desc then
|
||||
local SpeedMax = Desc.speedMax
|
||||
local SpeedMax = Desc.speedMax or 0
|
||||
return SpeedMax * 3.6
|
||||
end
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user