harvester Deliver order works with queues

2019-02-01 23:39:07 +01:00
parent f64c8f1ee8
commit 307a87cd9e
4 changed files with 49 additions and 15 deletions
--- a/OpenRA.Mods.Common/Traits/Harvester.cs
+++ b/OpenRA.Mods.Common/Traits/Harvester.cs
@@ -397,7 +397,8 @@ namespace OpenRA.Mods.Common.Traits
 				LinkProc(self, OwnerLinkedProc = null);
 				idleSmart = true;

-				self.CancelActivity();
+				if (!order.Queued)
+					self.CancelActivity();

 				CPos loc;
 				if (order.Target.Type != TargetType.Invalid)
@@ -442,7 +443,9 @@ namespace OpenRA.Mods.Common.Traits

 				self.SetTargetLine(order.Target, Color.Green);

-				self.CancelActivity();
+				if (!order.Queued)
+					self.CancelActivity();
+
 				self.QueueActivity(new DeliverResources(self));

 				foreach (var n in notifyHarvesterAction)