1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 12:17:26 +08:00

Fix smoke being blocked with "Relax" mod enabled

This commit is contained in:
Salman Ahmed 2022-10-09 15:28:12 +03:00
parent 9bb4c70393
commit c89a55043e

View File

@ -3,8 +3,10 @@
#nullable disable #nullable disable
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Linq;
using osu.Framework.Input; using osu.Framework.Input;
using osu.Framework.Input.Bindings; using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
@ -60,17 +62,14 @@ namespace osu.Game.Rulesets.Osu
{ {
public bool AllowUserPresses = true; public bool AllowUserPresses = true;
private static readonly OsuAction[] all_actions = (OsuAction[])Enum.GetValues(typeof(OsuAction));
protected override IEnumerable<OsuAction> BlockedActions => !AllowUserPresses ? all_actions.Where(a => a != OsuAction.Smoke) : Enumerable.Empty<OsuAction>();
public OsuKeyBindingContainer(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique) public OsuKeyBindingContainer(RulesetInfo ruleset, int variant, SimultaneousBindingMode unique)
: base(ruleset, variant, unique) : base(ruleset, variant, unique)
{ {
} }
protected override bool Handle(UIEvent e)
{
if (!AllowUserPresses) return false;
return base.Handle(e);
}
} }
} }