diff --git a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs index c2a68c8ca1..ea4265e641 100644 --- a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs +++ b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs @@ -19,6 +19,9 @@ namespace osu.Game.Online.API.Requests.Responses [JsonProperty(@"status")] public BeatmapSetOnlineStatus Status { get; set; } + [JsonProperty("checksum")] + public string Checksum { get; set; } + [JsonProperty(@"beatmapset")] public APIBeatmapSet BeatmapSet { get; set; } @@ -78,6 +81,7 @@ namespace osu.Game.Online.API.Requests.Responses // this is actually an incorrect mapping (Length is calculated as drain length in lazer's import process, see BeatmapManager.calculateLength). Length = TimeSpan.FromSeconds(length).TotalMilliseconds, Status = Status, + MD5Hash = Checksum, BeatmapSet = set, Metrics = metrics, MaxCombo = maxCombo, diff --git a/osu.Game/Online/Rooms/APIPlaylistBeatmap.cs b/osu.Game/Online/Rooms/APIPlaylistBeatmap.cs deleted file mode 100644 index 00623282d3..0000000000 --- a/osu.Game/Online/Rooms/APIPlaylistBeatmap.cs +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. -// See the LICENCE file in the repository root for full licence text. - -using Newtonsoft.Json; -using osu.Game.Beatmaps; -using osu.Game.Online.API.Requests.Responses; -using osu.Game.Rulesets; - -namespace osu.Game.Online.Rooms -{ - public class APIPlaylistBeatmap : APIBeatmap - { - [JsonProperty("checksum")] - public string Checksum { get; set; } - - public override BeatmapInfo ToBeatmapInfo(RulesetStore rulesets) - { - var b = base.ToBeatmapInfo(rulesets); - b.MD5Hash = Checksum; - return b; - } - } -} diff --git a/osu.Game/Online/Rooms/PlaylistItem.cs b/osu.Game/Online/Rooms/PlaylistItem.cs index 48f1347fa1..7fcce1514d 100644 --- a/osu.Game/Online/Rooms/PlaylistItem.cs +++ b/osu.Game/Online/Rooms/PlaylistItem.cs @@ -7,6 +7,7 @@ using Newtonsoft.Json; using osu.Framework.Bindables; using osu.Game.Beatmaps; using osu.Game.Online.API; +using osu.Game.Online.API.Requests.Responses; using osu.Game.Rulesets; using osu.Game.Rulesets.Mods; @@ -42,7 +43,7 @@ namespace osu.Game.Online.Rooms public readonly BindableList RequiredMods = new BindableList(); [JsonProperty("beatmap")] - private APIPlaylistBeatmap apiBeatmap { get; set; } + private APIBeatmap apiBeatmap { get; set; } private APIMod[] allowedModsBacking;