Clean up usage of CancelActivity.

2019-08-31 16:47:12 +02:00
parent 1e786b8e31
commit ac6431acf8
22 changed files with 24 additions and 83 deletions
--- a/OpenRA.Mods.Common/Traits/Carryall.cs
+++ b/OpenRA.Mods.Common/Traits/Carryall.cs
@@ -313,9 +313,6 @@ namespace OpenRA.Mods.Common.Traits
 				if (order.Target.Type != TargetType.Actor)
 					return;

-				if (!order.Queued)
-					self.CancelActivity();
-
 				self.QueueActivity(order.Queued, new PickupUnit(self, order.Target.Actor, Info.BeforeLoadDelay));
 				self.ShowTargetLines();
 			}