1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 21:52:55 +08:00

Fix post-merge errors

This commit is contained in:
smoogipoo 2019-02-19 16:30:29 +09:00
parent 8104c45c25
commit bf17826363
2 changed files with 1 additions and 7 deletions

View File

@ -2,17 +2,11 @@
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Game.Rulesets.Difficulty; using osu.Game.Rulesets.Difficulty;
using osu.Game.Rulesets.Mods;
namespace osu.Game.Rulesets.Mania.Difficulty namespace osu.Game.Rulesets.Mania.Difficulty
{ {
public class ManiaDifficultyAttributes : DifficultyAttributes public class ManiaDifficultyAttributes : DifficultyAttributes
{ {
public double GreatHitWindow; public double GreatHitWindow;
public ManiaDifficultyAttributes(Mod[] mods)
: base(mods)
{
}
} }
} }

View File

@ -89,7 +89,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty
return skills.ToArray(); return skills.ToArray();
} }
protected override DifficultyAttributes CreateDifficultyAttributes(Mod[] mods) => new ManiaDifficultyAttributes(mods); protected override DifficultyAttributes CreateDifficultyAttributes() => new ManiaDifficultyAttributes();
protected override Mod[] DifficultyAdjustmentMods protected override Mod[] DifficultyAdjustmentMods
{ {