From 2912bff850569e941f3a072282de760c8fa9c2cd Mon Sep 17 00:00:00 2001
From: tovl <tomvanleth@gmail.com>
Date: Mon, 1 Jul 2019 23:27:06 +0200
Subject: [PATCH] Fix location checks for queued deployment.

---
 OpenRA.Mods.Common/Activities/Transform.cs | 10 +---------
 OpenRA.Mods.Common/Traits/Transforms.cs    |  5 +----
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/OpenRA.Mods.Common/Activities/Transform.cs b/OpenRA.Mods.Common/Activities/Transform.cs
index 0f49260510..9fab16684a 100644
--- a/OpenRA.Mods.Common/Activities/Transform.cs
+++ b/OpenRA.Mods.Common/Activities/Transform.cs
@@ -51,10 +51,7 @@ namespace OpenRA.Mods.Common.Activities
 			// Prevent deployment in bogus locations
 			var transforms = self.TraitOrDefault<Transforms>();
 			if (transforms != null && !transforms.CanDeploy())
-			{
-				Cancel(self, true);
 				return true;
-			}
 
 			foreach (var nt in self.TraitsImplementing<INotifyTransform>())
 				nt.BeforeTransform(self);
@@ -71,15 +68,10 @@ namespace OpenRA.Mods.Common.Activities
 				return false;
 			}
 
+			DoTransform(self);
 			return true;
 		}
 
-		protected override void OnLastRun(Actor self)
-		{
-			if (!IsCanceling)
-				DoTransform(self);
-		}
-
 		void DoTransform(Actor self)
 		{
 			// This activity may be buried as a child within one or more parents
diff --git a/OpenRA.Mods.Common/Traits/Transforms.cs b/OpenRA.Mods.Common/Traits/Transforms.cs
index 1b5db57fc8..f839f3c42a 100644
--- a/OpenRA.Mods.Common/Traits/Transforms.cs
+++ b/OpenRA.Mods.Common/Traits/Transforms.cs
@@ -137,10 +137,7 @@ namespace OpenRA.Mods.Common.Traits
 				return;
 			}
 
-			if (!queued)
-				self.CancelActivity();
-
-			self.QueueActivity(GetTransformActivity(self));
+			self.QueueActivity(queued, GetTransformActivity(self));
 		}
 
 		public void ResolveOrder(Actor self, Order order)