Merge branch 'master' into beatmap-cancellation-token

This commit is contained in:
Dean Herbert
2021-11-16 14:43:13 +09:00
206 changed files with 4647 additions and 1128 deletions

View File

@ -291,7 +291,7 @@ namespace osu.Game.Beatmaps
catch (BeatmapInvalidForRulesetException e)
{
if (rulesetInfo.Equals(beatmapInfo.Ruleset))
Logger.Error(e, $"Failed to convert {beatmapInfo.OnlineBeatmapID} to the beatmap's default ruleset ({beatmapInfo.Ruleset}).");
Logger.Error(e, $"Failed to convert {beatmapInfo.OnlineID} to the beatmap's default ruleset ({beatmapInfo.Ruleset}).");
return new StarDifficulty();
}