Skip to content
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 cargo initialisation #17561

Merged
merged 1 commit into from Jan 12, 2020
Merged

Fix cargo initialisation #17561

merged 1 commit into from Jan 12, 2020

Conversation

@abcdefg30
Copy link
Member

abcdefg30 commented Jan 5, 2020

Closes #17555. (See #17376 (comment))

@abcdefg30 abcdefg30 added this to the Next+1 milestone Jan 5, 2020
@pchote

This comment has been minimized.

Copy link
Member

pchote commented Jan 5, 2020

I suspect that this is still too early. We can't guarantee that the ConditionManager has been initialized before Cargo, so the condition granting may not work.

@abcdefg30 abcdefg30 force-pushed the abcdefg30:passanger branch from 846ee66 to fa496f9 Jan 5, 2020
@abcdefg30

This comment has been minimized.

Copy link
Member Author

abcdefg30 commented Jan 5, 2020

Moved in a FrameEndTask as discussed on IRC.

@abcdefg30 abcdefg30 force-pushed the abcdefg30:passanger branch from fa496f9 to 9f19e96 Jan 5, 2020
@fusion809

This comment has been minimized.

Copy link
Contributor

fusion809 commented Jan 6, 2020

I can at least confirm that it does, indeed, fix the problem.

Copy link
Member

pchote left a comment

LGTM, just one minor comment tweak:

OpenRA.Mods.Common/Traits/Cargo.cs Outdated Show resolved Hide resolved
@abcdefg30 abcdefg30 force-pushed the abcdefg30:passanger branch from 6562007 to bc58b45 Jan 9, 2020
@abcdefg30

This comment has been minimized.

Copy link
Member Author

abcdefg30 commented Jan 9, 2020

Updated.

@pchote
pchote approved these changes Jan 12, 2020
Copy link
Member

pchote left a comment

Still LGTM.

@reaperrr reaperrr merged commit c15a555 into OpenRA:bleed Jan 12, 2020
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

4 participants
You can’t perform that action at this time.