Merge branch 'master' into api-offline-early-return

This commit is contained in:
Dean Herbert
2018-06-22 13:16:30 +09:00
committed by GitHub
101 changed files with 2798 additions and 1207 deletions

View File

@ -366,8 +366,7 @@ namespace osu.Game.Beatmaps
if (ruleset != null)
{
// TODO: this should be done in a better place once we actually need to dynamically update it.
var converted = new DummyConversionBeatmap(beatmap).GetPlayableBeatmap(ruleset);
beatmap.BeatmapInfo.StarDifficulty = ruleset.CreateInstance().CreateDifficultyCalculator(converted).Calculate();
beatmap.BeatmapInfo.StarDifficulty = ruleset.CreateInstance().CreateDifficultyCalculator(new DummyConversionBeatmap(beatmap)).Calculate().StarRating;
}
else
beatmap.BeatmapInfo.StarDifficulty = 0;