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: Prevents reloading from deleting containers #4104

Merged

Conversation

joveeater
Copy link
Collaborator

Purpose of change

Fixes #4068.

Describe the solution

Moves magazine reloading to the new safer stack splitting system and moves the old charges==0 check to the one branch that still uses the old stuff.

Describe alternatives you've considered

Cleaning it up further, moving that last branch to the newer stuff and sorting out whatever's going on with speedloaders is probably a good idea at some point.

Testing

The reported bug (i.e. reloading liquids), reloading magazines, reloading singles and reloading with a speedloader.

@github-actions github-actions bot added the src changes related to source code. label Jan 13, 2024
Copy link
Contributor

autofix-ci bot commented Jan 13, 2024

The Autofix app has found code style violation and automatically formatted this Pull Request.

I locally edit my commits (e.g: git, github desktop)

Please choose following options:

I'd like to accept the automated commit
  1. Run git pull. this will merge the automated commit into your local copy of the PR branch.
  2. Continue working.
I do not want the automated commit
  1. Format your code locally, then commit it.
  2. Run git push --force to force push your branch. This will overwrite the automated commit on remote with your local one.
  3. Continue working.

If you don't do this, your following commits will be based on the old commit, and cause MERGE CONFLICT.

This PR is complete and I don't want to edit it anymore

It's safe to ignore this message.

I edit this PR through web UI

You can ignore this message and continue working.

I have no idea what this message is talking about

You can ignore this message and continue working. If you find any problem, please ask for help and ping @scarf005.

@scarf005 scarf005 merged commit db0b411 into cataclysmbnteam:main Jan 13, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
src changes related to source code.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Reloading the container A fully eliminates the container B
2 participants