From 697d12aefc4c4fb19ce913658f03eecf0a56e19b Mon Sep 17 00:00:00 2001
From: Applevangelist <72444570+Applevangelist@users.noreply.github.com>
Date: Sun, 3 Jan 2021 16:31:07 +0100
Subject: [PATCH 1/4] Update AI_A2A_Dispatcher.lua

#1422
---
 Moose Development/Moose/AI/AI_A2A_Dispatcher.lua | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua b/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua
index 05ef48758..eae6ded44 100644
--- a/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua	
+++ b/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua	
@@ -2919,9 +2919,13 @@ do -- AI_A2A_DISPATCHER
   -- @return #AI_A2A_DISPATCHER.Squadron Squadron The squadron.
   function AI_A2A_DISPATCHER:GetSquadronFromDefender( Defender )
     self.Defenders = self.Defenders or {}
-    local DefenderName = Defender:GetName()
-    self:F( { DefenderName = DefenderName } )
-    return self.Defenders[ DefenderName ]
+    if Defender ~= nil then
+      local DefenderName = Defender:GetName()
+      self:F( { DefenderName = DefenderName } )
+      return self.Defenders[ DefenderName ]
+    else
+      return nil        
+    end
   end
 
 

From 8e46e41b340c44f186775a759a7a5578eefd3d76 Mon Sep 17 00:00:00 2001
From: Applevangelist <72444570+Applevangelist@users.noreply.github.com>
Date: Tue, 5 Jan 2021 09:54:10 +0100
Subject: [PATCH 2/4] Update AI_Cargo_Helicopter.lua

Fix for missed FSM call
---
 Moose Development/Moose/AI/AI_Cargo_Helicopter.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Moose Development/Moose/AI/AI_Cargo_Helicopter.lua b/Moose Development/Moose/AI/AI_Cargo_Helicopter.lua
index 0307266c7..95361511c 100644
--- a/Moose Development/Moose/AI/AI_Cargo_Helicopter.lua	
+++ b/Moose Development/Moose/AI/AI_Cargo_Helicopter.lua	
@@ -82,7 +82,8 @@ function AI_CARGO_HELICOPTER:New( Helicopter, CargoSet )
   self:AddTransition( "Boarding", "Loaded", "Loaded" )
   self:AddTransition( "Unboarding", "Pickup", "Unloaded" )  
   self:AddTransition( "Unloaded", "Unboard", "Unloaded" )  
-  self:AddTransition( "Unloaded", "Unloaded", "Unloaded" ) 
+  self:AddTransition( "Unloaded", "Unloaded", "Unloaded" )
+  self:AddTransition( "*", "PickedUp", "*" )
   self:AddTransition( "*", "Landed", "*" )
   self:AddTransition( "*", "Queue", "*" )
   self:AddTransition( "*", "Orbit" , "*" ) 

From 218c7736e0c4a538326d07e3f6bb667a701d6a12 Mon Sep 17 00:00:00 2001
From: Applevangelist <72444570+Applevangelist@users.noreply.github.com>
Date: Tue, 5 Jan 2021 11:25:03 +0100
Subject: [PATCH 3/4] Update AI_Cargo_Helicopter.lua

---
 Moose Development/Moose/AI/AI_Cargo_Helicopter.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Moose Development/Moose/AI/AI_Cargo_Helicopter.lua b/Moose Development/Moose/AI/AI_Cargo_Helicopter.lua
index 95361511c..1f58b7b08 100644
--- a/Moose Development/Moose/AI/AI_Cargo_Helicopter.lua	
+++ b/Moose Development/Moose/AI/AI_Cargo_Helicopter.lua	
@@ -79,7 +79,7 @@ function AI_CARGO_HELICOPTER:New( Helicopter, CargoSet )
   self:AddTransition( "Unboarding", "Deployed", "Unloaded" )
   self:AddTransition( "Unboarding", "Pickup", "Unloaded" )
   --]]
-  self:AddTransition( "Boarding", "Loaded", "Loaded" )
+  self:AddTransition( "*", "Loaded", "Loaded" )
   self:AddTransition( "Unboarding", "Pickup", "Unloaded" )  
   self:AddTransition( "Unloaded", "Unboard", "Unloaded" )  
   self:AddTransition( "Unloaded", "Unloaded", "Unloaded" )

From cbc5b5bb89f49a5635e1e45fb95f05aca690fa3c Mon Sep 17 00:00:00 2001
From: Applevangelist <72444570+Applevangelist@users.noreply.github.com>
Date: Tue, 5 Jan 2021 11:27:37 +0100
Subject: [PATCH 4/4] Update AI_Cargo.lua

Fix for another dead end
---
 Moose Development/Moose/AI/AI_Cargo.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Moose Development/Moose/AI/AI_Cargo.lua b/Moose Development/Moose/AI/AI_Cargo.lua
index a5a08b2e7..1de7e2d0f 100644
--- a/Moose Development/Moose/AI/AI_Cargo.lua	
+++ b/Moose Development/Moose/AI/AI_Cargo.lua	
@@ -52,7 +52,8 @@ function AI_CARGO:New( Carrier, CargoSet )
   self:AddTransition( "Loaded", "Deploy", "*" )
   
   self:AddTransition( "*", "Load", "Boarding" )
-  self:AddTransition( { "Boarding", "Loaded" }, "Board", "Boarding" )
+  self:AddTransition( "Boarding", "Board", "Boarding" )
+  self:AddTransition( "Loaded", "Board", "Loaded" )
   self:AddTransition( "Boarding", "Loaded", "Boarding" )
   self:AddTransition( "Boarding", "PickedUp", "Loaded" )