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 ReloadAmmoPool.ResetFire ignoring multipliers #17454

Merged
merged 1 commit into from Jan 11, 2020

Conversation

@reaperrr
Copy link
Contributor

reaperrr commented Dec 12, 2019

Fixes #17399.

@reaperrr reaperrr force-pushed the reaperrr:fix-ammo-reset-delay branch from d9c51c3 to 4e05a5a Dec 13, 2019
@reaperrr

This comment has been minimized.

Copy link
Contributor Author

reaperrr commented Dec 13, 2019

Updated, applied fix to creation as well. It's possible there already are active modifiers at that point, after all.

@abcdefg30

This comment has been minimized.

Copy link
Member

abcdefg30 commented Dec 13, 2019

My 👍 still stands.

@reaperrr reaperrr force-pushed the reaperrr:fix-ammo-reset-delay branch from 4e05a5a to 60c4aa9 Dec 31, 2019
@reaperrr

This comment has been minimized.

Copy link
Contributor Author

reaperrr commented Dec 31, 2019

Updated.

@pchote
pchote approved these changes Jan 11, 2020
@pchote pchote merged commit bb1d5f1 into OpenRA:bleed Jan 11, 2020
1 of 2 checks passed
1 of 2 checks passed
continuous-integration/appveyor/pr AppVeyor build failed
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.

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