From dc11b82fc912831c90b43aadf89df463099a4f29 Mon Sep 17 00:00:00 2001
From: abcdefg30 <alphabet@streber24.de>
Date: Wed, 4 Aug 2021 23:09:23 +0200
Subject: [PATCH] Fix a NRE in DeliverUnit.ReleaseUnit.OnFirstRun

---
 OpenRA.Mods.Common/Activities/DeliverUnit.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/OpenRA.Mods.Common/Activities/DeliverUnit.cs b/OpenRA.Mods.Common/Activities/DeliverUnit.cs
index 1ade53a5ff..4ba1656440 100644
--- a/OpenRA.Mods.Common/Activities/DeliverUnit.cs
+++ b/OpenRA.Mods.Common/Activities/DeliverUnit.cs
@@ -78,6 +78,11 @@ namespace OpenRA.Mods.Common.Activities
 
 			protected override void OnFirstRun(Actor self)
 			{
+				// HACK: Activities still tick between the actor being killed and being disposed
+				// Thus the carryable might have changed since queuing because the death handler set it to null
+				if (carryall.Carryable == null)
+					return;
+
 				self.Trait<Aircraft>().RemoveInfluence();
 
 				var localOffset = carryall.CarryableOffset.Rotate(body.QuantizeOrientation(self, self.Orientation));