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

Merge branch 'master' into beatmap-cancellation-token

Browse Source
This commit is contained in:
Dean Herbert
2021-11-17 11:15:31 +09:00
parent 4d11794d31 0146987eba
commit 0715d40ea0
69 changed files with 315 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Beatmaps/WorkingBeatmap.cs
View File

@ -78,7 +78,7 @@ namespace osu.Game.Beatmaps
/// <returns>The applicable <see cref="IBeatmapConverter"/>.</returns>
protected virtual IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap, Ruleset ruleset) => ruleset.CreateBeatmapConverter(beatmap);
public virtual IBeatmap GetPlayableBeatmap(RulesetInfo ruleset, IReadOnlyList<Mod> mods = null, CancellationToken? cancellationToken = null)
public virtual IBeatmap GetPlayableBeatmap(IRulesetInfo ruleset, IReadOnlyList<Mod> mods = null, CancellationToken? cancellationToken = null)
{
var token = cancellationToken ?? new CancellationTokenSource(10000).Token;
mods ??= Array.Empty<Mod>();