Fix a NRE in DeliverUnit.ReleaseUnit.OnFirstRun

2021-08-04 23:09:23 +02:00
parent 6e0917169d
commit dc11b82fc9
1 changed files with 5 additions and 0 deletions
--- 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));