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

Change PlayingUsers population logic to match expectations

Browse Source
This commit is contained in:
Bartłomiej Dach 2020-12-28 19:11:44 +01:00
parent 9155671557
commit 1d311a6680
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
View File

@ -133,6 +133,7 @@ namespace osu.Game.Online.Multiplayer
apiRoom = null; apiRoom = null;
Room = null; Room = null;
PlayingUsers.Clear();
RoomUpdated?.Invoke(); RoomUpdated?.Invoke();
}, false); }, false);
@ -302,8 +303,7 @@ namespace osu.Game.Online.Multiplayer
Room.Users.Single(u => u.UserID == userId).State = state; Room.Users.Single(u => u.UserID == userId).State = state;
if (state != MultiplayerUserState.Playing) updatePlayingUsers(userId, state);
PlayingUsers.Remove(userId);
RoomUpdated?.Invoke(); RoomUpdated?.Invoke();
}, false); }, false);
@ -337,8 +337,6 @@ namespace osu.Game.Online.Multiplayer
if (Room == null) if (Room == null)
return; return;
PlayingUsers.AddRange(Room.Users.Where(u => u.State == MultiplayerUserState.Playing).Select(u => u.UserID));
MatchStarted?.Invoke(); MatchStarted?.Invoke();
}, false); }, false);
@ -454,5 +452,17 @@ namespace osu.Game.Online.Multiplayer
apiRoom.Playlist.Clear(); // Clearing should be unnecessary, but here for sanity. apiRoom.Playlist.Clear(); // Clearing should be unnecessary, but here for sanity.
apiRoom.Playlist.Add(playlistItem); apiRoom.Playlist.Add(playlistItem);
} }
private void updatePlayingUsers(int userId, MultiplayerUserState state)
{
bool isPlaying = state >= MultiplayerUserState.WaitingForLoad && state <= MultiplayerUserState.FinishedPlay;
bool wasPlaying = PlayingUsers.Contains(userId);
if (!wasPlaying && isPlaying)
PlayingUsers.Add(userId);
if (wasPlaying && !isPlaying)
PlayingUsers.Remove(userId);
}
} }
} }