From bb07e1935e694b761e9ce3917e40fe716ef8edb7 Mon Sep 17 00:00:00 2001
From: Rolf Geuenich <kaltokri@users.noreply.github.com>
Date: Fri, 12 Jan 2024 16:05:14 +0100
Subject: [PATCH] Downpatching changes from development to master

---
 Moose Development/Moose/Functional/MissileTrainer.lua |  1 -
 Moose Development/Moose/Functional/Warehouse.lua      |  2 +-
 Moose Development/Moose/Wrapper/Group.lua             | 10 +++++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Moose Development/Moose/Functional/MissileTrainer.lua b/Moose Development/Moose/Functional/MissileTrainer.lua
index 6fb9ff1a8..f52363ba2 100644
--- a/Moose Development/Moose/Functional/MissileTrainer.lua	
+++ b/Moose Development/Moose/Functional/MissileTrainer.lua	
@@ -72,7 +72,6 @@
 -- @module Functional.MissileTrainer
 -- @image Missile_Trainer.JPG
 
-
 ---
 -- @type MISSILETRAINER
 -- @field Core.Set#SET_CLIENT DBClients
diff --git a/Moose Development/Moose/Functional/Warehouse.lua b/Moose Development/Moose/Functional/Warehouse.lua
index 7ac6e2839..86c1255c7 100644
--- a/Moose Development/Moose/Functional/Warehouse.lua	
+++ b/Moose Development/Moose/Functional/Warehouse.lua	
@@ -87,7 +87,7 @@
 -- @field #number respawndelay Delay before respawn in seconds.
 -- @field #number runwaydestroyed Time stamp timer.getAbsTime() when the runway was destroyed.
 -- @field #number runwayrepairtime Time in seconds until runway will be repaired after it was destroyed. Default is 3600 sec (one hour).
--- @field Ops.FlightControl#FLIGHTCONTROL flightcontrol Flight control of this warehouse.
+-- @field OPS.FlightControl#FLIGHTCONTROL flightcontrol Flight control of this warehouse.
 -- @extends Core.Fsm#FSM
 
 --- Have your assets at the right place at the right time - or not!
diff --git a/Moose Development/Moose/Wrapper/Group.lua b/Moose Development/Moose/Wrapper/Group.lua
index d232bf604..080467e84 100644
--- a/Moose Development/Moose/Wrapper/Group.lua	
+++ b/Moose Development/Moose/Wrapper/Group.lua	
@@ -689,7 +689,15 @@ function GROUP:GetUnits()
     local DCSUnits = DCSGroup:getUnits() or {}
     local Units = {}
     for Index, UnitData in pairs( DCSUnits ) do
-      Units[#Units+1] = UNIT:Find( UnitData )
+      
+      local unit=UNIT:Find( UnitData )
+      if unit then
+        Units[#Units+1] = UNIT:Find( UnitData )
+      else
+        local UnitName=UnitData:getName()
+        unit=_DATABASE:AddUnit(UnitName)
+        Units[#Units+1]=unit
+      end
     end
     self:T3( Units )
     return Units