From bc80fa11bbeee2b39174ec1b68132cc3a6468bfe Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 1 Aug 2019 12:41:46 +0900
Subject: [PATCH 1/2] Mode IApplicableToBeatmap application to WorkingBeatmap

---
 osu.Game/Beatmaps/WorkingBeatmap.cs     |  3 +++
 osu.Game/Rulesets/UI/DrawableRuleset.cs | 15 ---------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 949a2aab6f..baf921ddfc 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -141,6 +141,9 @@ namespace osu.Game.Beatmaps
 
             processor?.PostProcess();
 
+            foreach (var mod in mods.OfType<IApplicableToBeatmap>())
+                mod.ApplyToBeatmap(Beatmap);
+
             return converted;
         }
 
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index faa6b98c86..ac81fdc719 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -109,8 +109,6 @@ namespace osu.Game.Rulesets.UI
 
             Beatmap = (Beatmap<TObject>)workingBeatmap.GetPlayableBeatmap(ruleset.RulesetInfo, mods);
 
-            applyBeatmapMods(mods);
-
             KeyBindingInputManager = CreateInputManager();
             playfield = new Lazy<Playfield>(CreatePlayfield);
 
@@ -269,19 +267,6 @@ namespace osu.Game.Rulesets.UI
 
         public override ScoreProcessor CreateScoreProcessor() => new ScoreProcessor<TObject>(this);
 
-        /// <summary>
-        /// Applies the active mods to the Beatmap.
-        /// </summary>
-        /// <param name="mods"></param>
-        private void applyBeatmapMods(IReadOnlyList<Mod> mods)
-        {
-            if (mods == null)
-                return;
-
-            foreach (var mod in mods.OfType<IApplicableToBeatmap>())
-                mod.ApplyToBeatmap(Beatmap);
-        }
-
         /// <summary>
         /// Applies the active mods to this DrawableRuleset.
         /// </summary>

From e2420af10c844d9459fd906b3035086c949e3266 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 1 Aug 2019 13:37:40 +0900
Subject: [PATCH 2/2] Fix applying mods to the wrong beatmap

---
 osu.Game/Beatmaps/WorkingBeatmap.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index baf921ddfc..c6105f6566 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -142,7 +142,7 @@ namespace osu.Game.Beatmaps
             processor?.PostProcess();
 
             foreach (var mod in mods.OfType<IApplicableToBeatmap>())
-                mod.ApplyToBeatmap(Beatmap);
+                mod.ApplyToBeatmap(converted);
 
             return converted;
         }