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

This commit is contained in:
Applevangelist 2025-02-19 17:33:53 +01:00
commit 20fa78bc85
3 changed files with 10 additions and 3 deletions

View File

@ -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 )

View File

@ -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()

View File

@ -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