Fix harvesters losing their last harvesting position when carried by carryall.

This commit is contained in:
tovl
2019-07-15 20:01:20 +02:00
committed by teinarss
parent d59b01597a
commit 922c6e9c40
16 changed files with 39 additions and 37 deletions

View File

@@ -58,7 +58,7 @@ namespace OpenRA.Mods.Common.Activities
if (self.Location != proc.Location + iao.DeliveryOffset)
{
foreach (var n in self.TraitsImplementing<INotifyHarvesterAction>())
n.MovingToRefinery(self, proc, new FindAndDeliverResources(self));
n.MovingToRefinery(self, proc);
QueueChild(movement.MoveTo(proc.Location + iao.DeliveryOffset, 0));
return false;

View File

@@ -56,7 +56,7 @@ namespace OpenRA.Mods.Common.Activities
if (self.Location != targetCell)
{
foreach (var n in self.TraitsImplementing<INotifyHarvesterAction>())
n.MovingToResources(self, targetCell, new FindAndDeliverResources(self));
n.MovingToResources(self, targetCell);
self.SetTargetLine(Target.FromCell(self.World, targetCell), Color.Red, false);
QueueChild(move.MoveTo(targetCell, 2));

View File

@@ -117,7 +117,7 @@ namespace OpenRA.Mods.Common.Activities
QueueChild(new WaitForTransport(self, moveActivities));
// TODO: Make this compatible with RepairableNear
transport.RequestTransport(self, targetCell, new Resupply(self, host.Actor, closeEnough));
transport.RequestTransport(self, targetCell);
}
else
QueueChild(moveActivities);