From 6501e89fa29877bebe8675fb965ae3fe9b2dfce8 Mon Sep 17 00:00:00 2001
From: Applevangelist <post@tniedermeier.com>
Date: Tue, 10 Jan 2023 07:47:56 +0100
Subject: [PATCH] #PSEUDOATC * Fix for debug messages

---
 .../Moose/Functional/PseudoATC.lua            | 62 +++++++++++--------
 1 file changed, 35 insertions(+), 27 deletions(-)

diff --git a/Moose Development/Moose/Functional/PseudoATC.lua b/Moose Development/Moose/Functional/PseudoATC.lua
index 67b86c5fe..1930394b6 100644
--- a/Moose Development/Moose/Functional/PseudoATC.lua	
+++ b/Moose Development/Moose/Functional/PseudoATC.lua	
@@ -100,7 +100,7 @@ PSEUDOATC.id="PseudoATC | "
 
 --- PSEUDOATC version.
 -- @field #number version
-PSEUDOATC.version="0.9.3"
+PSEUDOATC.version="0.9.4"
 
 -----------------------------------------------------------------------------------------------------------------------------------------
 
@@ -450,14 +450,18 @@ function PSEUDOATC:PlayerLanded(unit, place)
   local group=unit:GetGroup()
   local GID=group:GetID()
   local UID=unit:GetDCSObject():getID()
-  local PlayerName=self.group[GID].player[UID].playername
-  local UnitName=self.group[GID].player[UID].unitname
-  local GroupName=self.group[GID].player[UID].groupname
-  
-  -- Debug message.
-  local text=string.format("Player %s in unit %s of group %s (id=%d) landed at %s.", PlayerName, UnitName, GroupName, GID, place)
-  self:T(PSEUDOATC.id..text)
-  MESSAGE:New(text, 30):ToAllIf(self.Debug)
+  --local PlayerName=self.group[GID].player[UID].playername
+  --local UnitName=self.group[GID].player[UID].unitname
+  --local GroupName=self.group[GID].player[UID].groupname
+  local PlayerName = unit:GetPlayerName() or "Ghost"
+  local UnitName = unit:GetName() or "Ghostplane"
+  local GroupName = group:GetName() or "Ghostgroup"
+  if self.Debug then
+    -- Debug message.
+    local text=string.format("Player %s in unit %s of group %s landed at %s.", PlayerName, UnitName, GroupName, place)
+    self:T(PSEUDOATC.id..text)
+    MESSAGE:New(text, 30):ToAllIf(self.Debug)
+  end
   
   -- Stop altitude reporting timer if its activated.
   self:AltitudeTimerStop(GID,UID)
@@ -479,24 +483,28 @@ function PSEUDOATC:PlayerTakeOff(unit, place)
   
   -- Gather some information.
   local group=unit:GetGroup()
-  local GID=group:GetID()
-  local UID=unit:GetDCSObject():getID()
-  local PlayerName=self.group[GID].player[UID].playername
-  local CallSign=self.group[GID].player[UID].callsign
-  local UnitName=self.group[GID].player[UID].unitname
-  local GroupName=self.group[GID].player[UID].groupname
-  
-  -- Debug message.
-  local text=string.format("Player %s in unit %s of group %s (id=%d) took off at %s.", PlayerName, UnitName, GroupName, GID, place)
-  self:T(PSEUDOATC.id..text)
-  MESSAGE:New(text, 30):ToAllIf(self.Debug)
-    
+  --local GID=group:GetID()
+  --local UID=unit:GetDCSObject():getID()
+  --local PlayerName=self.group[GID].player[UID].playername
+  --local CallSign=self.group[GID].player[UID].callsign
+  --local UnitName=self.group[GID].player[UID].unitname
+  --local GroupName=self.group[GID].player[UID].groupname
+  local PlayerName = unit:GetPlayerName() or "Ghost"
+  local UnitName = unit:GetName() or "Ghostplane"
+  local GroupName = group:GetName() or "Ghostgroup"
+  local CallSign = unit:GetCallsign() or "Ghost11"
+  if self.Debug then
+    -- Debug message.
+    local text=string.format("Player %s in unit %s of group %s took off at %s.", PlayerName, UnitName, GroupName, place)
+    self:T(PSEUDOATC.id..text)
+    MESSAGE:New(text, 30):ToAllIf(self.Debug)
+  end
   -- Bye-Bye message.
   if place and self.chatty then
     local text=string.format("%s, %s, you are airborne. Have a safe trip!", place, CallSign)
-	if self.reportplayername then
-		text=string.format("%s, %s, you are airborne. Have a safe trip!", place, PlayerName)
-	end
+  if self.reportplayername then
+    text=string.format("%s, %s, you are airborne. Have a safe trip!", place, PlayerName)
+  end
     MESSAGE:New(text, self.mdur):ToGroup(group)
   end
 
@@ -857,7 +865,7 @@ function PSEUDOATC:ReportHeight(GID, UID, dt, _clear)
     local height=get_AGL(position)
     local callsign=unit:GetCallsign()
     local PlayerName=self.group[GID].player[UID].playername
-	
+  
     -- Settings.
     local settings=_DATABASE:GetPlayerSettings(self.group[GID].player[UID].playername) or _SETTINGS --Core.Settings#SETTINGS
     
@@ -870,8 +878,8 @@ function PSEUDOATC:ReportHeight(GID, UID, dt, _clear)
     -- Message text.
     local _text=string.format("%s, your altitude is %s AGL.", callsign, Hs)
     if self.reportplayername then
-		_text=string.format("%s, your altitude is %s AGL.", PlayerName, Hs)
-	end
+    _text=string.format("%s, your altitude is %s AGL.", PlayerName, Hs)
+  end
     -- Append flight level.
     if _clear==false then
       _text=_text..string.format(" FL%03d.", position.y/30.48)