Skip to content

fix: resetting local user on profile change [MTT-11948] #916

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.

Sign up for GitHub

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

Merged
fernando-cortez merged 5 commits into from
Jul 10, 2025
Merged

fix: resetting local user on profile change [MTT-11948] #916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8680645
resetting local user on profile change
Jun 17, 2025
8e98278
cleanup
fernando-cortez Jul 3, 2025
05f8c88
Merge branch 'develop' into fix/reset-local-user
fernando-cortez Jul 3, 2025
cd7dc67
Merge branch 'develop' into fix/reset-local-user
fernando-cortez Jul 7, 2025
79b480c
formatting
fernando-cortez Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions Assets/Scripts/Gameplay/GameState/ClientMainMenuState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ protected override void Configure(IContainerBuilder builder)
builder.RegisterComponent(m_IPUIMediator);
}

private async void TrySignIn()
async void TrySignIn()
{
try
{
Expand All @@ -88,16 +88,21 @@ private async void TrySignIn()
}
}

private void OnAuthSignIn()
void OnAuthSignIn()
{
m_SessionButton.interactable = true;
m_UGSSetupTooltipDetector.enabled = false;
m_SignInSpinner.SetActive(false);

Debug.Log($"Signed in. Unity Player ID {AuthenticationService.Instance.PlayerId}");

m_LocalUser.ID = AuthenticationService.Instance.PlayerId;

// The local SessionUser object will be hooked into UI before the LocalSession is populated during session join, so the LocalSession must know about it already when that happens.
m_LocalSession.AddUser(m_LocalUser);
}

private void OnSignInFailed()
void OnSignInFailed()
{
if (m_SessionButton)
{
Expand Down
3 changes: 2 additions & 1 deletion Assets/Scripts/UnityServices/Sessions/LocalSession.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,10 @@ public void ApplyRemoteData(ISession session)
CopyDataFrom(info, localSessionUsers);
}

public void Reset()
public void Reset(LocalSessionUser localUser)
{
CopyDataFrom(new SessionData(), new Dictionary<string, LocalSessionUser>());
AddUser(localUser);
}
}
}
2 changes: 1 addition & 1 deletion Assets/Scripts/UnityServices/Sessions/MultiplayerServicesFacade.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ void ResetSession()
{
CurrentUnitySession = null;
m_LocalUser?.ResetState();
m_LocalSession?.Reset();
m_LocalSession?.Reset(m_LocalUser);

// no need to disconnect Netcode, it should already be handled by Netcode's callback to disconnect
}
Expand Down