Merge pull request #532 from FlightControl-Master/master-release-prep

Fix DETECTION_AREAS
Fix DetectedItemCount for DETECTION_AREAS
2025-08-15 10:47:21 +00:00 · 2017-05-18 21:04:26 +02:00 · 2017-05-18 20:59:36 +02:00 · 2017-05-18 20:59:03 +02:00 · 2017-05-18 14:14:39 +02:00
2 changed files with 43310 additions and 71 deletions
--- a/Development/Moose/Functional/Detection.lua
+++ b/Development/Moose/Functional/Detection.lua
@@ -1192,7 +1192,7 @@ do -- DETECTION_BASE
    end
    
    DetectedItem.Set = Set or SET_UNIT:New():FilterDeads():FilterCrashes()
-    DetectedItem.Index = DetectedItemIndex
+    DetectedItem.Index = DetectedItemIndex or self.DetectedItemCount
    DetectedItem.ItemID = ItemPrefix .. "." .. self.DetectedItemMax
    DetectedItem.ID = self.DetectedItemMax
    DetectedItem.Removed = false
--- a/Setup/Moose.lua
+++ b/Setup/Moose.lua
Author	SHA1	Message	Date
Sven Van de Velde	e2a0aa5573	Merge pull request #532 from FlightControl-Master/master-release-prep Fix DETECTION_AREAS	2017-05-18 21:04:26 +02:00
FlightControl	a932f49554	Fix DetectedItemCount for DETECTION_AREAS	2017-05-18 20:59:36 +02:00
FlightControl	a57e24212e	Merge remote-tracking branch 'refs/remotes/origin/master-release-2.1' into master-release-prep	2017-05-18 20:59:03 +02:00
Sven Van de Velde	0d2e398e37	Merge pull request #529 from FlightControl-Master/master-release-prep Fixes #528	2017-05-18 14:14:39 +02:00