epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix harv dock sequence issuing drag despite cancellation

Browse Source
This commit is contained in:
reaperrr
2020-10-18 16:46:45 +02:00
committed by abcdefg30
parent 385f01247b
commit 90d9ee1f5c
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.Common/Activities/HarvesterDockSequence.cs
View File

@@ -59,7 +59,7 @@ namespace OpenRA.Mods.Common.Activities
return false; return false;
case DockingState.Drag: case DockingState.Drag:
if (!Refinery.IsInWorld || Refinery.IsDead) if (IsCanceling || !Refinery.IsInWorld || Refinery.IsDead)
return true; return true;
dockingState = DockingState.Dock; dockingState = DockingState.Dock;
@@ -69,7 +69,7 @@ namespace OpenRA.Mods.Common.Activities
return false; return false;
case DockingState.Dock: case DockingState.Dock:
if (Refinery.IsInWorld && !Refinery.IsDead) if (!IsCanceling && Refinery.IsInWorld && !Refinery.IsDead)
{ {
foreach (var nd in Refinery.TraitsImplementing<INotifyDocking>()) foreach (var nd in Refinery.TraitsImplementing<INotifyDocking>())
nd.Docked(Refinery, self); nd.Docked(Refinery, self);
@@ -82,7 +82,7 @@ namespace OpenRA.Mods.Common.Activities
return false; return false;
case DockingState.Loop: case DockingState.Loop:
if (!Refinery.IsInWorld || Refinery.IsDead || Harv.TickUnload(self, Refinery)) if (IsCanceling || !Refinery.IsInWorld || Refinery.IsDead || Harv.TickUnload(self, Refinery))
dockingState = DockingState.Undock; dockingState = DockingState.Undock;
return false; return false;
@@ -107,12 +107,6 @@ namespace OpenRA.Mods.Common.Activities
throw new InvalidOperationException("Invalid harvester dock state"); throw new InvalidOperationException("Invalid harvester dock state");
} }
public override void Cancel(Actor self, bool keepQueue = false)
{
dockingState = DockingState.Undock;
base.Cancel(self);
}
public override IEnumerable<Target> GetTargets(Actor self) public override IEnumerable<Target> GetTargets(Actor self)
{ {
yield return Target.FromActor(Refinery); yield return Target.FromActor(Refinery);