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

Undock harvesters when refinery is destroyed or not in world

Browse Source 
fixes #2029
This commit is contained in:
Matthias Mailänder
2013-04-21 18:13:56 +02:00
parent b4f14d2ba6
commit e09a7f57f3
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Cnc/Activities/HarvesterDockSequence.cs
View File

@@ -56,7 +56,7 @@ namespace OpenRA.Mods.Cnc
state = State.Wait; state = State.Wait;
return this; return this;
case State.Loop: case State.Loop:
if (harv.TickUnload(self, proc)) if (!proc.IsInWorld || proc.IsDead() || harv.TickUnload(self, proc))
state = State.Undock; state = State.Undock;
return this; return this;
case State.Undock: case State.Undock:

2
OpenRA.Mods.RA/Activities/RAHarvesterDockSequence.cs
View File

@@ -49,7 +49,7 @@ namespace OpenRA.Mods.RA
state = State.Wait; state = State.Wait;
return this; return this;
case State.Loop: case State.Loop:
if (harv.TickUnload(self, proc)) if (!proc.IsInWorld || proc.IsDead() || harv.TickUnload(self, proc))
state = State.Undock; state = State.Undock;
return this; return this;
case State.Undock: case State.Undock:

3
OpenRA.Mods.RA/Harvester.cs
View File

@@ -212,9 +212,6 @@ namespace OpenRA.Mods.RA
// Returns true when unloading is complete // Returns true when unloading is complete
public bool TickUnload(Actor self, Actor proc) public bool TickUnload(Actor self, Actor proc)
{ {
if (!proc.IsInWorld)
return false; // fail to deliver if there is no proc.
// Wait until the next bale is ready // Wait until the next bale is ready
if (--currentUnloadTicks > 0) if (--currentUnloadTicks > 0)
return false; return false;