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

Moose Development/Moose/Core/Spawn.lua

@@ -1689,8 +1689,8 @@ function SPAWN:SpawnWithIndex( SpawnIndex, NoBirth )
 
       -- If there is a SpawnFunction hook defined, call it.
       if self.SpawnFunctionHook then
-        -- delay calling this for .1 seconds so that it hopefully comes after the BIRTH event of the group.
+        -- delay calling this for .3 seconds so that it hopefully comes after the BIRTH event of the group.
-        self.SpawnHookScheduler:Schedule( nil, self.SpawnFunctionHook, { self.SpawnGroups[self.SpawnIndex].Group, unpack( self.SpawnFunctionArguments ) }, 0.1 )
+        self.SpawnHookScheduler:Schedule( nil, self.SpawnFunctionHook, { self.SpawnGroups[self.SpawnIndex].Group, unpack( self.SpawnFunctionArguments ) }, 0.3 )
       end
       -- TODO: Need to fix this by putting an "R" in the name of the group when the group repeats.
       -- if self.Repeat then

Moose Development/Moose/Wrapper/Group.lua

@@ -1132,8 +1132,9 @@ function GROUP:GetAverageVec3()
     -- Average.
     local Vec3={x=x/n, y=y/n, z=z/n} --DCS#Vec3
     return Vec3
-  end
+  else
-  return nil 
+    return self:GetVec3()
+  end 
 end
 
 --- Returns a POINT_VEC2 object indicating the point in 2D of the first UNIT of the GROUP within the mission.
@@ -1167,8 +1168,13 @@ function GROUP:GetAverageCoordinate()
     coord.Heading = Heading
     return coord
   else
-    BASE:E( { "Cannot GetAverageCoordinate", Group = self, Alive = self:IsAlive() } )
+    local coord = self:GetCoordinate()
-    return nil
+    if coord then
+      return coord
+    else
+      BASE:E( { "Cannot GetAverageCoordinate", Group = self, Alive = self:IsAlive() } )
+      return nil
+    end
   end
 end