Fix error when loading proficiencies from save #42670
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.
Summary
SUMMARY: Bugfixes "Fix error when loading proficiencies from save"
Purpose of change
Looks like #42476 updated how proficiencies are saved but didn't actually update the save version when merged (perhaps some other PR also changed the save version to 31, which the merge tool thinks can just be merged safely but actually cannot be), so saves created in version 31 saved proficiencies as an array but the code tries to read an object for version > 30.
Describe the solution
Since both an array and an object can be saved in version 31 saves, we can only read according to whether the saved proficiencies are an array or object now.
Testing
Save now loads.
Additional context
We might want to find a way to avoid this kind of merge error.