From c1331cef1b7364a3ba42fb3e80f5f6a4cd6f49a6 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Mon, 22 Jan 2018 15:52:54 +0900 Subject: [PATCH] Disallow DualStages for non-converted beatmaps --- osu.Game.Rulesets.Mania/Mods/ManiaModDualStages.cs | 4 ++++ osu.Game/Rulesets/UI/RulesetContainer.cs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModDualStages.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModDualStages.cs index 1ba4ef9af1..3330d87e88 100644 --- a/osu.Game.Rulesets.Mania/Mods/ManiaModDualStages.cs +++ b/osu.Game.Rulesets.Mania/Mods/ManiaModDualStages.cs @@ -34,6 +34,10 @@ namespace osu.Game.Rulesets.Mania.Mods { var mrc = (ManiaRulesetContainer)rulesetContainer; + // Although this can work, for now let's not allow keymods for mania-specific beatmaps + if (mrc.IsForCurrentRuleset) + return; + var newDefinitions = new List(); foreach (var existing in mrc.Beatmap.Stages) { diff --git a/osu.Game/Rulesets/UI/RulesetContainer.cs b/osu.Game/Rulesets/UI/RulesetContainer.cs index bb4466208b..375af75347 100644 --- a/osu.Game/Rulesets/UI/RulesetContainer.cs +++ b/osu.Game/Rulesets/UI/RulesetContainer.cs @@ -154,7 +154,7 @@ namespace osu.Game.Rulesets.UI /// /// Whether the specified beatmap is assumed to be specific to the current ruleset. /// - protected readonly bool IsForCurrentRuleset; + public readonly bool IsForCurrentRuleset; public override ScoreProcessor CreateScoreProcessor() => new ScoreProcessor(this);