Skip to content

fix(battle): add another double battle desync failsafe#7139

Merged
DayKev merged 1 commit intopagefaultgames:hotfix-1.11.14from
DayKev:fix/double-battle-failsafe
Mar 6, 2026
Merged

fix(battle): add another double battle desync failsafe#7139
DayKev merged 1 commit intopagefaultgames:hotfix-1.11.14from
DayKev:fix/double-battle-failsafe

Conversation

@DayKev
Copy link
Collaborator

@DayKev DayKev commented Mar 6, 2026

What are the changes the user will see?

Another scenario where the trainer type was desynched with the battle type is now accounted for, preventing a crash.

Why am I making these changes?

Bug report.

What are the changes from a developer perspective?

Added another check to the failsafe accounting for corrupt save data.

How to test the changes?

Ensure it's possible to progress to the next wave in the following session data: sessionData_Ajdin1103.prsv.txt

Checklist

  • The PR content is correctly formatted:
    • [ ] I'm using beta as my base branch
    • The current branch is not named beta, main or the name of another long-lived feature branch
    • I have provided a clear explanation of the changes within the PR description
    • The PR title matches the Conventional Commits format (as described in CONTRIBUTING.md)
  • The PR is self-contained and cannot be split into smaller PRs
  • There is no overlap with another open PR
  • The PR has been confirmed to work correctly:
    • I have tested the changes manually

@DayKev DayKev requested a review from a team as a code owner March 6, 2026 02:22
@DayKev DayKev added the P1 Bug Major. Game crashing move/ability/interaction label Mar 6, 2026
@DayKev DayKev requested review from Fontbane and removed request for a team March 6, 2026 02:22
@DayKev DayKev added the Battle For issues relating to the battle engine (such as Terastallization, damage calcs, etc) label Mar 6, 2026
@DayKev DayKev requested review from Madmadness65 and fabske0 March 6, 2026 02:22
@DayKev DayKev merged commit 2072060 into pagefaultgames:hotfix-1.11.14 Mar 6, 2026
15 checks passed
@DayKev DayKev deleted the fix/double-battle-failsafe branch March 6, 2026 03:17
@github-actions github-actions bot mentioned this pull request Mar 8, 2026
Merged
damocleas added a commit that referenced this pull request Mar 10, 2026
@damocleas
chore!: Hotfix 1.11.14 to main (#7143)
2efa8cf 
* chore!: update version to `1.11.14`

* fix(battle): add another double battle desync failsafe (#7139)

* dev: remove `@ts-nocheck` from `game-wrapper.ts` (#7070)

* fix: properly utilize cached fetching for all URLs (#7129)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Madmadness65 Madmadness65 Madmadness65 approved these changes

@Bertie690 Bertie690 Bertie690 approved these changes

@Fontbane Fontbane Awaiting requested review from Fontbane Fontbane is a code owner automatically assigned from pagefaultgames/junior-dev-team

@fabske0 fabske0 Awaiting requested review from fabske0 fabske0 is a code owner automatically assigned from pagefaultgames/junior-dev-team

Assignees

No one assigned

Labels

Battle For issues relating to the battle engine (such as Terastallization, damage calcs, etc) P1 Bug Major. Game crashing move/ability/interaction

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@DayKev @Madmadness65 @Bertie690