Skip to content

Use shared entry transition for bootstrap reconnect#929

Merged
notfood merged 2 commits into
rwmt:devfrom
MhaWay:fix-bootstrap-return-entry
May 20, 2026
Merged

Use shared entry transition for bootstrap reconnect#929
notfood merged 2 commits into
rwmt:devfrom
MhaWay:fix-bootstrap-return-entry

Conversation

@MhaWay
Copy link
Copy Markdown
Contributor

@MhaWay MhaWay commented May 19, 2026

Summary

  • route bootstrap save-upload reconnect through the same Entry transition flow already used by Rejoiner
  • extract a shared helper in Rejoiner so the Harmony-controlled return-to-entry path is implemented once
  • keep the bootstrap reconnect waiting for Entry completion before reconnecting

Testing

  • dotnet build .\Client\Multiplayer.csproj --configuration Release -v:q
  • manual bootstrap test confirming save creation and reconnect flow complete without the return-to-menu crash

Copilot AI review requested due to automatic review settings May 19, 2026 21:16
@MhaWay
Copy link
Copy Markdown
Contributor Author

MhaWay commented May 19, 2026

1.6, fix, standalone server

Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR routes the bootstrap save-upload reconnect path through the same “return to Entry” long-event transition used by the Rejoiner flow, aiming to avoid the return-to-menu crash and ensure reconnect only happens once Entry is fully reached.

Changes:

  • Switch bootstrap reconnect from GenScene.GoToMainMenu() to a shared “return to Entry” transition and wait for Entry completion before reconnecting.
  • Extract Rejoiner.ReturnToEntry(Action onFinished) and refactor DoRejoin() to reuse it.
  • Stop the current multiplayer session before initiating the bootstrap reconnect.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

File Description
Source/Client/Windows/BootstrapConfiguratorWindow.BootstrapFlow.cs Updates bootstrap save-upload reconnect to return to Entry via Rejoiner.ReturnToEntry and reconnect after Entry completes.
Source/Client/Session/Rejoiner.cs Extracts a reusable ReturnToEntry helper and refactors DoRejoin to call it.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread Source/Client/Session/Rejoiner.cs
@notfood notfood added fix Fixes for a bug or desync. 1.6 Fixes or bugs relating to 1.6 (Not Odyssey). standalone server Fix or bugs relating to the standalone server. labels May 19, 2026
@notfood notfood moved this to In review in 1.6 and Odyssey May 19, 2026
@notfood notfood merged commit fa37fdd into rwmt:dev May 20, 2026
1 check passed
@github-project-automation github-project-automation Bot moved this from In review to Done in 1.6 and Odyssey May 20, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1.6 Fixes or bugs relating to 1.6 (Not Odyssey). fix Fixes for a bug or desync. standalone server Fix or bugs relating to the standalone server.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants