New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix FindResources aborting to early #15856

Merged
merged 1 commit into from Nov 25, 2018

Conversation

Projects
None yet
3 participants
@obrakmann
Copy link
Contributor

obrakmann commented Nov 25, 2018

In Harvester::UnblockRefinery, there is this bit of code:

// FindResources takes care of calling INotifyHarvesterAction
self.QueueActivity(new FindResources(self));

self.QueueActivity(mobile.MoveTo(moveTo, 1));

However, the NextInQueue check early in FindResources::Tick would prevent the INotfiyHarvesterAction interface from actually getting called due to the queued move activity, therefore no carryalls get requested.

I have so far not noticed any wrong behaviour from harvesters without this check.

Fixes #15846

@obrakmann obrakmann added this to the Next Release milestone Nov 25, 2018

@reaperrr
Copy link
Contributor

reaperrr left a comment

👍 Skipping this activity if there's a queued activity sounds like some legacy bogosity anyway

@pchote

pchote approved these changes Nov 25, 2018

Copy link
Member

pchote left a comment

The original code looks bogus, so this is worth the risk of regression. If this does break something, then that gives us a chance to fix it properly.

@pchote pchote merged commit 7454427 into OpenRA:bleed Nov 25, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@obrakmann obrakmann deleted the obrakmann:fix15846_d2k-carryall-snafu branch Dec 23, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment