From 5280637adf1b5e13244f0714c8b29976383152d0 Mon Sep 17 00:00:00 2001
From: matjaeck <59416324+matjaeck@users.noreply.github.com>
Date: Thu, 18 Jun 2020 23:12:06 +0200
Subject: [PATCH] Fix PickupUnit not validating cargo on first run.

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

diff --git a/OpenRA.Mods.Common/Activities/PickupUnit.cs b/OpenRA.Mods.Common/Activities/PickupUnit.cs
index 433574af83..ef64cf4d0a 100644
--- a/OpenRA.Mods.Common/Activities/PickupUnit.cs
+++ b/OpenRA.Mods.Common/Activities/PickupUnit.cs
@@ -49,6 +49,10 @@ namespace OpenRA.Mods.Common.Activities
 
 		protected override void OnFirstRun(Actor self)
 		{
+			// The cargo might have become invalid while we were moving towards it.
+			if (cargo.IsDead || carryable.IsTraitDisabled || !cargo.AppearsFriendlyTo(self))
+				return;
+
 			if (carryall.ReserveCarryable(self, cargo))
 			{
 				// Fly to the target and wait for it to be locked for pickup