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

Moose Development/Moose/Wrapper/Positionable.lua

@@ -239,18 +239,18 @@ end
 function POSITIONABLE:GetVec3()
   local DCSPositionable = self:GetDCSObject()
   if DCSPositionable then
-    local status, vec3 = pcall(
-       function()
-          local vec3 = DCSPositionable:getPoint()
-          return vec3
-       end
-    )
-    --local vec3 = DCSPositionable:getPoint()
-    if status then
+    --local status, vec3 = pcall(
+      -- function()
+        --  local vec3 = DCSPositionable:getPoint()
+        --  return vec3
+       --end
+    --)
+    local vec3 = DCSPositionable:getPoint()
+    --if status then
       return vec3
-    else
-      self:E( { "Cannot get Vec3 from DCS Object", Positionable = self, Alive = self:IsAlive() } )
-    end
+    --else
+      --self:E( { "Cannot get Vec3 from DCS Object", Positionable = self, Alive = self:IsAlive() } )
+    --end
   end
   -- ERROR!
   self:E( { "Cannot get the Positionable DCS Object for GetVec3", Positionable = self, Alive = self:IsAlive() } )

Moose Development/Moose/Wrapper/Unit.lua

@@ -703,17 +703,17 @@ function UNIT:GetAmmo()
   self:F2( self.UnitName )
   local DCSUnit = self:GetDCSObject()
   if DCSUnit then
-    local status, unitammo = pcall(
-       function()
-         local UnitAmmo = DCSUnit:getAmmo()
-         return UnitAmmo
-       end
-    )
-    if status then
-      return unitammo
-    end
-    --local UnitAmmo = DCSUnit:getAmmo()
-    --return UnitAmmo
+    --local status, unitammo = pcall(
+      -- function()
+        -- local UnitAmmo = DCSUnit:getAmmo()
+        -- return UnitAmmo
+       --end
+    --)
+    --if status then
+      --return unitammo
+    --end
+    local UnitAmmo = DCSUnit:getAmmo()
+    return UnitAmmo
   end
   return nil
 end