h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 02:33:02 +08:00
Code Issues Releases Wiki Activity

Avoid multiplayer crashes when events arrive in unexpected order

Browse Source 
Intended to be a temporary fix for
https://github.com/ppy/osu/issues/17713 while a more permanent solution
is established. A proper fix is actually quite simple, but updating the
test to work with it is... *slightly* more complicated.

This hotfix will mean that if a `UserJoined` event arrives during the
unobserved window during room join (of the local user), the local user
still won't see the joining user, but the game won't crash as a result.
This commit is contained in:
Dean Herbert 2022-04-08 17:55:43 +09:00
parent 975bb8cc2a
commit 5c571996d8
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Online/Multiplayer/MultiplayerClient.cs
View File

@ -493,11 +493,13 @@ namespace osu.Game.Online.Multiplayer
{
Scheduler.Add(() =>
{
if (Room == null)
var user = Room?.Users.SingleOrDefault(u => u.UserID == userId);
// TODO: user should NEVER be null here, see https://github.com/ppy/osu/issues/17713.
if (user == null)
return;
Room.Users.Single(u => u.UserID == userId).State = state;
user.State = state;
updateUserPlayingState(userId, state);
RoomUpdated?.Invoke();
@ -510,10 +512,13 @@ namespace osu.Game.Online.Multiplayer
{
Scheduler.Add(() =>
{
if (Room == null)
var user = Room?.Users.SingleOrDefault(u => u.UserID == userId);
// TODO: user should NEVER be null here, see https://github.com/ppy/osu/issues/17713.
if (user == null)
return;
Room.Users.Single(u => u.UserID == userId).MatchState = state;
user.MatchState = state;
RoomUpdated?.Invoke();
}, false);