Merge pull request #2449 from FlightControl-Master/master

Merge from master

Moose Development/Moose/Core/Event.lua

@@ -1475,7 +1475,7 @@ function EVENT:onEvent( Event )
           -- SCENERY
           ---
           Event.TgtDCSUnit = Event.target
-          Event.TgtDCSUnitName = Event.TgtDCSUnit.getName and Event.TgtDCSUnit.getName() or nil
+          Event.TgtDCSUnitName = Event.TgtDCSUnit.getName and Event.TgtDCSUnit:getName() or nil
           if Event.TgtDCSUnitName~=nil then
             Event.TgtUnitName = Event.TgtDCSUnitName
             Event.TgtUnit = SCENERY:Register( Event.TgtDCSUnitName, Event.target )

Moose Development/Moose/Core/Set.lua

@@ -945,7 +945,8 @@ do -- SET_BASE
   function SET_BASE:IsInSet(Object)
     --self:F3(Object)
     local outcome = false
-    local name = Object:GetName()
+    if Object == nil then return false end
+    local name = (Object ~= nil and Object.GetName) and Object:GetName() or "none"
     --self:I("SET_BASE: Objectname = "..name)
     self:ForEach(
       function(object)

Moose Development/Moose/Core/Zone.lua

@@ -1165,7 +1165,7 @@ function ZONE_RADIUS:Scan( ObjectCategories, UnitCategories )
   self.ScanData.SceneryTable = {}
   self.ScanData.Units = {}
 
-  local ZoneCoord = self:GetCoordinate()
+  local ZoneCoord = self:GetCoordinate():SetAlt()
   local ZoneRadius = self:GetRadius()
 
   --self:F({ZoneCoord = ZoneCoord, ZoneRadius = ZoneRadius, ZoneCoordLL = ZoneCoord:ToStringLLDMS()})