From 595809f0906661b598b888bd2f09457f40e193b5 Mon Sep 17 00:00:00 2001
From: Oliver Brakmann <ob-web2013+github@posteo.net>
Date: Fri, 3 Jul 2020 21:46:21 +0200
Subject: [PATCH] Fix Carryalls waiting for actors on transit-only tiles

---
 OpenRA.Mods.Common/Traits/Carryable.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OpenRA.Mods.Common/Traits/Carryable.cs b/OpenRA.Mods.Common/Traits/Carryable.cs
index 39a7a2541e..c1181390e5 100644
--- a/OpenRA.Mods.Common/Traits/Carryable.cs
+++ b/OpenRA.Mods.Common/Traits/Carryable.cs
@@ -129,6 +129,9 @@ namespace OpenRA.Mods.Common.Traits
 			if (delayPickups.Any(d => d.IsTraitEnabled() && !d.TryLockForPickup(self, carrier)))
 				return LockResponse.Pending;
 
+			if (mobile != null && !mobile.CanStayInCell(self.Location))
+				return LockResponse.Pending;
+
 			if (state != State.Locked)
 			{
 				state = State.Locked;