From ddf824b4942de44251fdbcf61e018cd222fc0532 Mon Sep 17 00:00:00 2001
From: abcdefg30 <alphabet@streber24.de>
Date: Wed, 7 Aug 2019 22:54:36 +0200
Subject: [PATCH] Fix AutoCarryall crashing when the cargo dies

---
 OpenRA.Mods.Common/Traits/AutoCarryall.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OpenRA.Mods.Common/Traits/AutoCarryall.cs b/OpenRA.Mods.Common/Traits/AutoCarryall.cs
index c1204aaa60..17e5b8fc8a 100644
--- a/OpenRA.Mods.Common/Traits/AutoCarryall.cs
+++ b/OpenRA.Mods.Common/Traits/AutoCarryall.cs
@@ -118,6 +118,9 @@ namespace OpenRA.Mods.Common.Traits
 
 			public override bool Tick(Actor self)
 			{
+				if (cargo.IsDead)
+					return true;
+
 				var dropRange = self.Trait<Carryall>().Info.DropRange;
 				var destination = cargo.Trait<Carryable>().Destination;
 				if (destination != null)