From 666d2e7bacd5e4d15f68a7aab50bd746786adafc Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Sat, 2 Mar 2019 11:51:46 +0000
Subject: [PATCH] Work around harvester unloading activity queue issues.

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

diff --git a/OpenRA.Mods.Common/Activities/FindResources.cs b/OpenRA.Mods.Common/Activities/FindResources.cs
index 85179a9921..91a3c1f1b8 100644
--- a/OpenRA.Mods.Common/Activities/FindResources.cs
+++ b/OpenRA.Mods.Common/Activities/FindResources.cs
@@ -53,7 +53,10 @@ namespace OpenRA.Mods.Common.Activities
 				return NextActivity;
 
 			if (harv.IsFull)
-				return ActivityUtils.SequenceActivities(new DeliverResources(self), NextActivity);
+			{
+				// HACK: DeliverResources is ignored if there are queued activities, so discard NextActivity
+				return ActivityUtils.SequenceActivities(new DeliverResources(self));
+			}
 
 			var closestHarvestablePosition = ClosestHarvestablePos(self);