From de63a1b578d422a1c39b6212018ed3448c806ec5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 16 May 2018 01:43:58 +0900
Subject: [PATCH] Remove construction of new ruleset

---
 .../Difficulty/ManiaPerformanceCalculator.cs                 | 2 +-
 osu.Game/Rulesets/Difficulty/PerformanceCalculator.cs        | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceCalculator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceCalculator.cs
index 024362f5d2..f5f815d9fb 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaPerformanceCalculator.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty
             if (mods.Any(m => !m.Ranked))
                 return 0;
 
-            IEnumerable<Mod> scoreIncreaseMods = new ManiaRuleset().GetModsFor(ModType.DifficultyIncrease);
+            IEnumerable<Mod> scoreIncreaseMods = Ruleset.GetModsFor(ModType.DifficultyIncrease);
 
             double scoreMultiplier = 1.0;
             foreach (var m in mods.Where(m => !scoreIncreaseMods.Contains(m)))
diff --git a/osu.Game/Rulesets/Difficulty/PerformanceCalculator.cs b/osu.Game/Rulesets/Difficulty/PerformanceCalculator.cs
index 9fd7a0156d..07d9c80061 100644
--- a/osu.Game/Rulesets/Difficulty/PerformanceCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/PerformanceCalculator.cs
@@ -16,6 +16,7 @@ namespace osu.Game.Rulesets.Difficulty
         private readonly Dictionary<string, double> attributes = new Dictionary<string, double>();
         protected IDictionary<string, double> Attributes => attributes;
 
+        protected readonly Ruleset Ruleset;
         protected readonly IBeatmap Beatmap;
         protected readonly Score Score;
 
@@ -23,9 +24,9 @@ namespace osu.Game.Rulesets.Difficulty
 
         protected PerformanceCalculator(Ruleset ruleset, IBeatmap beatmap, Score score)
         {
-            Score = score;
-
+            Ruleset = ruleset;
             Beatmap = beatmap;
+            Score = score;
 
             var diffCalc = ruleset.CreateDifficultyCalculator(beatmap, score.Mods);
             diffCalc.Calculate(attributes);