Merge branch 'master' into develop

# Conflicts:
#	Moose Development/Moose/Core/Set.lua
This commit is contained in:
Rolf Geuenich 2024-01-12 15:35:17 +01:00
commit 2e386be2f6

View File

@ -7845,17 +7845,16 @@ do -- SET_OPSGROUP
if Event.IniDCSUnit and Event.IniDCSGroup then if Event.IniDCSUnit and Event.IniDCSGroup then
local DCSgroup=Event.IniDCSGroup --DCS#Group local DCSgroup=Event.IniDCSGroup --DCS#Group
if DCSgroup:getInitialSize() == DCSgroup:getSize() then -- This seems to be not a good check as even for the first birth event, getSize returns the total number of units in the group. if DCSgroup:getInitialSize() == DCSgroup:getSize() then -- This seems to be not a good check as even for the first birth event, getSize returns the total number of units in the group.
local groupname, group = self:AddInDatabase( Event ) local groupname, group = self:AddInDatabase( Event )
if group and group:CountAliveUnits()==DCSgroup:getInitialSize() then if group and group:CountAliveUnits()==DCSgroup:getInitialSize() then
if group and self:IsIncludeObject( group ) then if group and self:IsIncludeObject( group ) then
self:Add( groupname, group ) self:Add( groupname, group )
end end
end end
end end
end end
end end