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

Merge branch 'master' into new-multiplayer-playlist

Browse Source
This commit is contained in:
Dan Balasescu
2021-12-01 21:11:16 +09:00
parent f9b4e6f004 85c31232ac
commit 89c47708a1
22 changed files with 579 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
View File

@ -336,7 +336,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
public override Task AddPlaylistItem(MultiplayerPlaylistItem item) => AddUserPlaylistItem(api.LocalUser.Value.OnlineID, item);
protected override Task<APIBeatmapSet> GetOnlineBeatmapSet(int beatmapId, CancellationToken cancellationToken = default)
protected override Task<APIBeatmap> GetAPIBeatmap(int beatmapId, CancellationToken cancellationToken = default)
{
IBeatmapSetInfo? set = roomManager.ServerSideRooms.SelectMany(r => r.Playlist)
.FirstOrDefault(p => p.BeatmapID == beatmapId)?.Beatmap.Value.BeatmapSet
@ -345,13 +345,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
if (set == null)
throw new InvalidOperationException("Beatmap not found.");
var apiSet = new APIBeatmapSet
return Task.FromResult(new APIBeatmap
{
OnlineID = set.OnlineID,
Beatmaps = set.Beatmaps.Select(b => new APIBeatmap { OnlineID = b.OnlineID }).ToArray(),
};
return Task.FromResult(apiSet);
BeatmapSet = new APIBeatmapSet { OnlineID = set.OnlineID },
OnlineID = beatmapId,
Checksum = set.Beatmaps.First(b => b.OnlineID == beatmapId).MD5Hash
});
}
private async Task changeMatchType(MatchType type)