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

# Conflicts:
#	Moose Development/Moose/Modules.lua
#	Moose Setup/Moose.files
This commit is contained in:
Applevangelist 2023-02-16 18:24:35 +01:00
commit 39b94a2ac1

View File

@ -591,7 +591,7 @@ do -- OpsZone
function DATABASE:FindOpsZone( ZoneName )
local ZoneFound = self.OPSZONES[ZoneName]
return ZoneFound
end
@ -599,15 +599,15 @@ do -- OpsZone
-- @param #DATABASE self
-- @param Ops.OpsZone#OPSZONE OpsZone The zone.
function DATABASE:AddOpsZone( OpsZone )
if OpsZone then
local ZoneName=OpsZone:GetName()
if not self.OPSZONES[ZoneName] then
self.OPSZONES[ZoneName] = OpsZone
end
end
end