From 93640b1d8eaaf27b733e168db7e4160f2aa3140d Mon Sep 17 00:00:00 2001
From: FlightControl_Master <sven.van.de.velde@telenet.be>
Date: Thu, 29 Mar 2018 12:02:07 +0200
Subject: [PATCH] -- Further fixes for TASK_CARGO_TRANSPORT

---
 .../Moose/Wrapper/Controllable.lua            | 20 -------------------
 Moose Development/Moose/Wrapper/Group.lua     | 19 ++++++++++++++++++
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/Moose Development/Moose/Wrapper/Controllable.lua b/Moose Development/Moose/Wrapper/Controllable.lua
index 01fe228e4..7da5fe917 100644
--- a/Moose Development/Moose/Wrapper/Controllable.lua	
+++ b/Moose Development/Moose/Wrapper/Controllable.lua	
@@ -202,26 +202,6 @@ end
 
 -- Get methods
 
---- Returns the UNITs wrappers of the DCS Units of the Controllable (default is a GROUP).
--- @param #CONTROLLABLE self
--- @return #list<Wrapper.Unit#UNIT> The UNITs wrappers.
-function CONTROLLABLE:GetUnits()
-  self:F2( { self.ControllableName } )
-  local DCSControllable = self:GetDCSObject()
-
-  if DCSControllable then
-    local DCSUnits = DCSControllable:getUnits()
-    local Units = {}
-    for Index, UnitData in pairs( DCSUnits ) do
-      Units[#Units+1] = UNIT:Find( UnitData )
-    end
-    self:T3( Units )
-    return Units
-  end
-
-  return nil
-end
-
 
 --- Returns the health. Dead controllables have health <= 1.0.
 -- @param #CONTROLLABLE self
diff --git a/Moose Development/Moose/Wrapper/Group.lua b/Moose Development/Moose/Wrapper/Group.lua
index 0606b14a0..66d9068a3 100644
--- a/Moose Development/Moose/Wrapper/Group.lua	
+++ b/Moose Development/Moose/Wrapper/Group.lua	
@@ -330,6 +330,25 @@ function GROUP:GetCountry()
   return nil
 end
 
+--- Returns a list of @{Unit} objects of the @{Group}.
+-- @param #GROUP self
+-- @return #list<Wrapper.Unit#UNIT> The list of @{Unit} objects of the @{Group}.
+function GROUP:GetUnits()
+  self:F2( { self.GroupName } )
+  local DCSGroup = self:GetDCSObject()
+
+  if DCSGroup then
+    local DCSUnits = DCSGroup:getUnits()
+    local Units = {}
+    for Index, UnitData in pairs( DCSUnits ) do
+      Units[#Units+1] = UNIT:Find( UnitData )
+    end
+    self:T3( Units )
+    return Units
+  end
+
+  return nil
+end
 --- Returns the UNIT wrapper class with number UnitNumber.
 -- If the underlying DCS Unit does not exist, the method will return nil. .
 -- @param #GROUP self