From db0c6d88bf9ae6e291850d5b8a12697c06d95cd3 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Sun, 9 Jun 2019 05:00:27 +0200
Subject: [PATCH] Fix AbortOnResupply not working

Going by yaml rules, all(!) aircraft in the shipping
mods should be aborting any previous activities
on resupply. None actually did, due to this bug.
---
 OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs b/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
index a48292ce41..d42f0adb47 100644
--- a/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
+++ b/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
@@ -142,7 +142,7 @@ namespace OpenRA.Mods.Common.Activities
 				resupplied = false;
 
 			if (resupplied && abortOnResupply)
-				Cancel(self);
+				self.CancelActivity();
 
 			if (resupplied || IsCanceling || self.IsDead)
 				return NextActivity;