h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 18:47:27 +08:00
Code Issues Releases Wiki Activity

Refactor playlist update to remove .Contains() check

Browse Source
This commit is contained in:
smoogipoo 2021-02-19 13:32:32 +09:00
parent bc10fcafae
commit 183a481a34
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -537,21 +537,30 @@ namespace osu.Game.Online.Multiplayer
var mods = settings.RequiredMods.Select(m => m.ToMod(ruleset));
var allowedMods = settings.AllowedMods.Select(m => m.ToMod(ruleset));
// Update an existing playlist item from the API room, or create a new item.
var playlistItem = apiRoom.Playlist.FirstOrDefault(i => i.ID == settings.PlaylistItemId) ?? new PlaylistItem();
// Try to retrieve the existing playlist item from the API room.
var playlistItem = apiRoom.Playlist.FirstOrDefault(i => i.ID == settings.PlaylistItemId);
playlistItem.ID = settings.PlaylistItemId;
playlistItem.Beatmap.Value = beatmap;
playlistItem.Ruleset.Value = ruleset.RulesetInfo;
playlistItem.RequiredMods.Clear();
playlistItem.RequiredMods.AddRange(mods);
playlistItem.AllowedMods.Clear();
playlistItem.AllowedMods.AddRange(allowedMods);
if (!apiRoom.Playlist.Contains(playlistItem))
if (playlistItem != null)
updateItem(playlistItem);
else
{
// An existing playlist item does not exist, so append a new one.
updateItem(playlistItem = new PlaylistItem());
apiRoom.Playlist.Add(playlistItem);
}
CurrentMatchPlayingItem.Value = playlistItem;
void updateItem(PlaylistItem item)
{
item.ID = settings.PlaylistItemId;
item.Beatmap.Value = beatmap;
item.Ruleset.Value = ruleset.RulesetInfo;
item.RequiredMods.Clear();
item.RequiredMods.AddRange(mods);
item.AllowedMods.Clear();
item.AllowedMods.AddRange(allowedMods);
}
}
/// <summary>