From 24eaa7441cdaeac616e66580f10d3ef86bc9ede6 Mon Sep 17 00:00:00 2001
From: Frank <frank@inter-zone.de>
Date: Wed, 27 Mar 2024 22:15:17 +0100
Subject: [PATCH] Update RAT.lua

---
 Moose Development/Moose/Functional/RAT.lua | 27 ++++++----------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/Moose Development/Moose/Functional/RAT.lua b/Moose Development/Moose/Functional/RAT.lua
index 4bd1e7bac..aad17571f 100644
--- a/Moose Development/Moose/Functional/RAT.lua	
+++ b/Moose Development/Moose/Functional/RAT.lua	
@@ -2350,7 +2350,11 @@ function RAT:_Respawn(index, lastpos, delay)
     end
     
     flightgroup:Despawn(0, true)
-    flightgroup:Stop()
+    flightgroup:__Stop(0.1)
+    -- This is usually done in _Despawn
+    ratcraft.group=nil
+    ratcraft.status="Dead"
+    -- TODO: remove ratcraft from self.ratcraft table
   
     local _departure=nil
     local _destination=nil
@@ -2500,30 +2504,13 @@ function RAT:_Respawn(index, lastpos, delay)
     end
   
     -- Spawn new group.
-    local arg={}
-    arg.self=self
-    arg.departure=_departure
-    arg.destination=_destination
-    arg.takeoff=_takeoff
-    arg.landing=_landing
-    arg.livery=_livery
-    arg.lastwp=_lastwp
-    arg.lastpos=_lastpos
-    arg.parkingdata=parkingdata
-    self:T(RAT.id..string.format("%s delayed respawn in %.1f seconds.", self.alias, respawndelay))
-    SCHEDULER:New(nil, self._SpawnWithRouteTimer, {arg}, respawndelay)
+    self:T(RAT.id..string.format("%s delayed respawn in %.1f seconds.", self.alias, respawndelay))  
+    self:ScheduleOnce(respawndelay, RAT._SpawnWithRoute, self,_departure,_destination,_takeoff,_landing,_livery, nil,_lastpos, nil, nil)
     
   end
 
 end
 
---- Delayed spawn function called by scheduler.
--- @param #RAT self
--- @param #table arg Parameters: arg.self, arg.departure, arg.destination, arg.takeoff, arg.landing, arg.livery, arg.lastwp, arg.lastpos, arg.parkingdata
-function RAT._SpawnWithRouteTimer(arg)
-  RAT._SpawnWithRoute(arg.self, arg.departure, arg.destination, arg.takeoff, arg.landing, arg.livery, arg.lastwp, arg.lastpos, nil, arg.parkingdata)
-end
-
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 --- Set the route of the AI plane. Due to DCS landing bug, this has to be done before the unit is spawned.