RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tidy up ruleset assignment code

This commit is contained in:
Dean Herbert 2020-05-20 10:06:23 +09:00
parent db4e3047dd
commit 9638064741
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
View File

@ -101,9 +101,6 @@ private ConvertResult convert(string name, Mod[] mods)
{
var beatmap = GetBeatmap(name);
var rulesetInstance = CreateRuleset();
beatmap.BeatmapInfo.Ruleset = beatmap.BeatmapInfo.RulesetID == rulesetInstance.RulesetInfo.ID ? rulesetInstance.RulesetInfo : new RulesetInfo();
var converterResult = new Dictionary<HitObject, IEnumerable<HitObject>>();
var working = new ConversionWorkingBeatmap(beatmap)
@ -115,7 +112,7 @@ private ConvertResult convert(string name, Mod[] mods)
}
};
working.GetPlayableBeatmap(rulesetInstance.RulesetInfo, mods);
working.GetPlayableBeatmap(CreateRuleset().RulesetInfo, mods);
return new ConvertResult
{
@ -152,8 +149,8 @@ public IBeatmap GetBeatmap(string name)
((LegacyBeatmapDecoder)decoder).ApplyOffsets = false;
var beatmap = decoder.Decode(stream);
// not sure but seems to be required.
beatmap.BeatmapInfo.Ruleset = CreateRuleset().RulesetInfo;
var rulesetInstance = CreateRuleset();
beatmap.BeatmapInfo.Ruleset = beatmap.BeatmapInfo.RulesetID == rulesetInstance.RulesetInfo.ID ? rulesetInstance.RulesetInfo : new RulesetInfo();
return beatmap;
}