From 6d51d3988c80b2cc496b7aeb18dbd835506651f3 Mon Sep 17 00:00:00 2001
From: tovl <tomvanleth@gmail.com>
Date: Sun, 24 Feb 2019 23:50:39 +0100
Subject: [PATCH] fix aircraft ResupplyActivity

---
 OpenRA.Mods.Common/Activities/Air/ResupplyAircraft.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/OpenRA.Mods.Common/Activities/Air/ResupplyAircraft.cs b/OpenRA.Mods.Common/Activities/Air/ResupplyAircraft.cs
index 3104d52df9..9b1c9cc8fe 100644
--- a/OpenRA.Mods.Common/Activities/Air/ResupplyAircraft.cs
+++ b/OpenRA.Mods.Common/Activities/Air/ResupplyAircraft.cs
@@ -16,7 +16,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.Activities
 {
-	public class ResupplyAircraft : CompositeActivity
+	public class ResupplyAircraft : Activity
 	{
 		public ResupplyAircraft(Actor self) { }
 
@@ -48,9 +48,18 @@ namespace OpenRA.Mods.Common.Activities
 
 		public override Activity Tick(Actor self)
 		{
+			if (ChildActivity != null)
+			{
+				ChildActivity = ActivityUtils.RunActivity(self, ChildActivity);
+				return this;
+			}
+
 			// Conditional fixes being able to stop aircraft from resupplying.
 			if (IsCanceled && NextInQueue == null)
+			{
 				OnFirstRun(self);
+				return this;
+			}
 
 			return NextActivity;
 		}