From aa4e5d0e7bdfb63e6dc2dd262ef81f96e2edb771 Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 26 Jun 2019 09:05:31 +0200 Subject: [PATCH] Detection fix issue #1173 fix for #1173 --- Moose Development/Moose/Core/Set.lua | 3 +-- Moose Development/Moose/Functional/Detection.lua | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Moose Development/Moose/Core/Set.lua b/Moose Development/Moose/Core/Set.lua index 2cc9eefc4..20554631b 100644 --- a/Moose Development/Moose/Core/Set.lua +++ b/Moose Development/Moose/Core/Set.lua @@ -1571,9 +1571,8 @@ do -- SET_GROUP return Count end - --- Iterate the SET_GROUP and count how many GROUPS are alive. + --- Iterate the SET_GROUP and count how many GROUPs and UNITs are alive. -- @param #SET_GROUP self - -- @param Core.Zone#ZONE ZoneObject The Zone to be tested for. -- @return #number The number of GROUPs completely in the Zone -- @return #number The number of UNITS alive. function SET_GROUP:CountAlive() diff --git a/Moose Development/Moose/Functional/Detection.lua b/Moose Development/Moose/Functional/Detection.lua index 133706fb9..d6f7c70fd 100644 --- a/Moose Development/Moose/Functional/Detection.lua +++ b/Moose Development/Moose/Functional/Detection.lua @@ -541,7 +541,8 @@ do -- DETECTION_BASE end - self.DetectionCount = self.DetectionSet:Count() + -- Count alive(!) groups only. Solves issue #1173 https://github.com/FlightControl-Master/MOOSE/issues/1173 + self.DetectionCount = self.DetectionSet:CountAlive() self.DetectionSet:ForEachGroupAlive( function( DetectionGroup )