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

Merge pull request #17725 from peppy/multiplayer-hotifx

Browse Source 
Avoid multiplayer crashes when events arrive in unexpected order
This commit is contained in:
Dan Balasescu 2022-04-08 20:23:37 +09:00 committed by GitHub
commit 62f5409191
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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);