h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-18 11:02:57 +08:00
Code Issues Releases Wiki Activity

Add BeatmapSetId to playlist items

Browse Source
This commit is contained in:
Dan Balasescu 2024-12-10 15:46:28 +09:00
parent a99a992ceb
commit 9abb92a8d6
No known key found for this signature in database
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Online/Rooms/MultiplayerPlaylistItem.cs
View File

@ -56,6 +56,9 @@ namespace osu.Game.Online.Rooms
[Key(10)]
public double StarRating { get; set; }
[Key(11)]
public int? BeatmapSetID { get; set; }
[SerializationConstructor]
public MultiplayerPlaylistItem()
{

6
osu.Game/Online/Rooms/PlaylistItem.cs
View File

@ -67,6 +67,9 @@ namespace osu.Game.Online.Rooms
set => Beatmap = new APIBeatmap { OnlineID = value };
}
[JsonProperty("beatmapset_id")]
public int? BeatmapSetId { get; set; }
/// <summary>
/// A beatmap representing this playlist item.
/// In many cases, this will *not* contain any usable information apart from OnlineID.
@ -101,6 +104,7 @@ namespace osu.Game.Online.Rooms
PlayedAt = item.PlayedAt;
RequiredMods = item.RequiredMods.ToArray();
AllowedMods = item.AllowedMods.ToArray();
BeatmapSetId = item.BeatmapSetID;
}
public void MarkInvalid() => valid.Value = false;
@ -133,12 +137,14 @@ namespace osu.Game.Online.Rooms
AllowedMods = AllowedMods,
RequiredMods = RequiredMods,
valid = { Value = Valid.Value },
BeatmapSetId = BeatmapSetId
};
}
public bool Equals(PlaylistItem? other)
=> ID == other?.ID
&& Beatmap.OnlineID == other.Beatmap.OnlineID
&& BeatmapSetId == other.BeatmapSetId
&& RulesetID == other.RulesetID
&& Expired == other.Expired
&& PlaylistOrder == other.PlaylistOrder

1
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
View File

@ -83,6 +83,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
{
ID = itemToEdit?.ID ?? 0,
BeatmapID = item.Beatmap.OnlineID,
BeatmapSetID = item.BeatmapSetId,
BeatmapChecksum = item.Beatmap.MD5Hash,
RulesetID = item.RulesetID,
RequiredMods = item.RequiredMods.ToArray(),