Adjust existing activities for changed NextActivity semantics

To make sure existing checks against NextActivity don't check the parent activity by mistake
This commit is contained in:
Oliver Brakmann
2016-12-04 20:50:00 +01:00
parent 4105f9ed22
commit e49b3d6458
4 changed files with 15 additions and 12 deletions

View File

@@ -35,8 +35,8 @@ namespace OpenRA.Mods.Common.Activities
public override Activity Tick(Actor self)
{
if (NextActivity != null)
return NextActivity;
if (NextInQueue != null)
return NextInQueue;
// Find the nearest best refinery if not explicitly ordered to a specific refinery:
if (harv.OwnerLinkedProc == null || !harv.OwnerLinkedProc.IsInWorld)