Use shared entry transition for bootstrap reconnect#929
Merged
Conversation
Contributor
Author
|
1.6, fix, standalone server |
There was a problem hiding this comment.
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 refactorDoRejoin()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.
notfood
approved these changes
May 19, 2026
mibac138
approved these changes
May 19, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Testing