sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-08 00:53:56 +09:00
Code Issues Packages Projects Releases Wiki Activity

Remove legacy playlist item ID handling

Browse Source
This commit is contained in:
smoogipoo
2021-05-18 21:03:59 +09:00
parent 6b90e602cc
commit 5f94b3bdac
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,10 +92,6 @@ namespace osu.Game.Online.Multiplayer
[Resolved] [Resolved]
private UserLookupCache userLookupCache { get; set; } = null!; private UserLookupCache userLookupCache { get; set; } = null!;
// Only exists for compatibility with old osu-server-spectator build.
// Todo: Can be removed on 2021/02/26.
private long defaultPlaylistItemId;
private Room? apiRoom; private Room? apiRoom;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -143,7 +139,6 @@ namespace osu.Game.Online.Multiplayer
{ {
Room = joinedRoom; Room = joinedRoom;
apiRoom = room; apiRoom = room;
defaultPlaylistItemId = apiRoom.Playlist.FirstOrDefault()?.ID ?? 0;
foreach (var user in joinedRoom.Users) foreach (var user in joinedRoom.Users)
updateUserPlayingState(user.UserID, user.State); updateUserPlayingState(user.UserID, user.State);
}, cancellationSource.Token).ConfigureAwait(false); }, cancellationSource.Token).ConfigureAwait(false);
@ -581,7 +576,7 @@ namespace osu.Game.Online.Multiplayer
void updateItem(PlaylistItem item) void updateItem(PlaylistItem item)
{ {
item.ID = settings.PlaylistItemId == 0 ? defaultPlaylistItemId : settings.PlaylistItemId; item.ID = settings.PlaylistItemId;
item.Beatmap.Value = beatmap; item.Beatmap.Value = beatmap;
item.Ruleset.Value = ruleset.RulesetInfo; item.Ruleset.Value = ruleset.RulesetInfo;
item.RequiredMods.Clear(); item.RequiredMods.Clear();