Merge branch 'master' into develop

FlightControl-Master · Nov 24, 2024 · c4d0319 · c4d0319
2 parents 6022a39 + 8021392
commit c4d0319
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Moose Development/Moose/Wrapper/Unit.lua b/Moose Development/Moose/Wrapper/Unit.lua
@@ -240,7 +240,9 @@ end
 -- @return DCS#Unit The DCS Group.
 function UNIT:GetDCSObject()
 
-  if (not self.LastCallDCSObject) or (self.LastCallDCSObject and timer.getTime() - self.LastCallDCSObject  > 1) then
+  -- FF: Added checks that DCSObject exists because otherwise there were problems when respawning the unit right after it was initially spawned (e.g. teleport in OPSGROUP).
+  --     Got "Unit does not exit" after coalition.addGroup() when trying to access unit data because LastCallDCSObject<=1. 
+  if (not self.LastCallDCSObject) or (self.LastCallDCSObject and timer.getTime()-self.LastCallDCSObject>1) or (self.DCSObject==nil) or (self.DCSObject:isExist()==false) then
 
     -- Get DCS group.
     local DCSUnit = Unit.getByName( self.UnitName )