fix: regression introduced with magazine reload fix #6176
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose of change (The Why)
Went to look back at what broke the mag reloading in the first place, it was introduced with #4817
#6174 partially reintroduced the issue, but in the form of you could then potentially load unsupported ammo into an empty magazine already inside a gun (300 Blackout on a STANAG on an AR-15)
Describe the solution (The How)
This should solve that by further checking if the item being reloaded is a magazine, that is contained on a gun/mod that doesn't support said ammunition.
Describe alternatives you've considered
N/A
Testing
Vanilla:
Modded:
Additional context
Should there be another check if the parent item is a gun / gunmod, instead of just checking if the magazine has a parent_item()?
Since we don't have pockets on BN, i couldn't imagine a situation where that would not be the case.
Checklist
Mandatory
closes #1234
in Summary of the PR so it can be closed automatically.main
so it won't cause conflict when updatingmain
branch later.