From fd69bce609a046f136b537245baa67f405d83476 Mon Sep 17 00:00:00 2001
From: abcdefg30 <alphabet@streber24.de>
Date: Tue, 15 Sep 2020 17:13:27 +0200
Subject: [PATCH] Use CancelActivity instead of hackily using ResolveOrder

---
 OpenRA.Mods.Common/Traits/Capturable.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/OpenRA.Mods.Common/Traits/Capturable.cs b/OpenRA.Mods.Common/Traits/Capturable.cs
index fa47692b7b..2cf9ea3022 100644
--- a/OpenRA.Mods.Common/Traits/Capturable.cs
+++ b/OpenRA.Mods.Common/Traits/Capturable.cs
@@ -43,11 +43,7 @@ namespace OpenRA.Mods.Common.Traits
 		void INotifyCapture.OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner, BitSet<CaptureType> captureTypes)
 		{
 			if (Info.CancelActivity)
-			{
-				var stop = new Order("Stop", self, false);
-				foreach (var t in self.TraitsImplementing<IResolveOrder>())
-					t.ResolveOrder(self, stop);
-			}
+				self.CancelActivity();
 		}
 
 		protected override void TraitEnabled(Actor self) { captureManager.RefreshCapturable(self); }