Merge branch 'master' into allowgameplayoverlays-hide-skip

This commit is contained in:
smoogipoo
2020-05-18 19:54:38 +09:00
239 changed files with 2282 additions and 1808 deletions

View File

@ -107,7 +107,7 @@ namespace osu.Game.Screens.Play
/// Whether failing should be allowed.
/// By default, this checks whether all selected mods allow failing.
/// </summary>
protected virtual bool AllowFail => Mods.Value.OfType<IApplicableFailOverride>().All(m => m.AllowFail);
protected virtual bool CheckModsAllowFailure() => Mods.Value.OfType<IApplicableFailOverride>().All(m => m.PerformFail());
private readonly bool allowPause;
private readonly bool showResults;
@ -488,7 +488,7 @@ namespace osu.Game.Screens.Play
private bool onFail()
{
if (!AllowFail)
if (!CheckModsAllowFailure())
return false;
HasFailed = true;