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

Witness: Bug fixes. #2161

Merged
merged 5 commits into from
Sep 10, 2023
Merged

Witness: Bug fixes. #2161

merged 5 commits into from
Sep 10, 2023

Conversation

blastron
Copy link
Collaborator

@blastron blastron commented Sep 9, 2023

What is this fixing or adding?

This fixes two problems:
 - A crash in the early "good" item placement on the tutorial gate when a plando contained an item not in the good item list
 - Crashes when processing malformed plando settings that represent items as nested structures.
@NewSoupVi
Copy link
Member

NewSoupVi commented Sep 9, 2023

For the record, the first bullet point is not actually in this PR, this is that git issue again where commits from last PR are showing up again bc of the use of squash merge.

(Look at "files changed", only the progressive items thing is actually part of this PR)

I probably can't always fix that myself, I have a way around the issue but I'm not sure you'd like it (I do history rewrites via git reset [last_clean_commit] --hard -> git rebase upstream/main -> push --force).

The strategy suggested by the AP devs is to use a feature branch for any change, and never actually commit or merge anything into NewSoupVi/main, except merging upstream/main into NewSoupVi/main once a PR has made it through. We can switch to this strategy if you like.

You can also look into the issue yourself to figure out a cleaner way for how to prevent it, feel free to discuss the issue with me ofc

@black-sliver black-sliver merged commit 6c84475 into ArchipelagoMW:main Sep 10, 2023
12 checks passed
@ThePhar ThePhar changed the title Witness bug fixes. Witness: Bug fixes. Oct 16, 2023
@ThePhar ThePhar added the is: bug/fix Issues that are reporting bugs or pull requests that are fixing bugs. label Oct 16, 2023
FlySniper pushed a commit to FlySniper/Archipelago that referenced this pull request Nov 14, 2023
Jouramie pushed a commit to Jouramie/Archipelago that referenced this pull request Feb 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
is: bug/fix Issues that are reporting bugs or pull requests that are fixing bugs.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants