Merge pull request #2582 from smoogipoo/fix-hr-application

Fix HR mod affecting original beatmap difficulty
ppy · May 18, 2018 · 2938ead · 2938ead
2 parents cdd43f7 + 33baaf8
commit 2938ead
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/osu-framework b/osu-framework
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -107,8 +107,14 @@ public IBeatmap GetPlayableBeatmap(RulesetInfo ruleset)
             IBeatmap converted = converter.Convert();
 
             // Apply difficulty mods
-            foreach (var mod in Mods.Value.OfType<IApplicableToDifficulty>())
-                mod.ApplyToDifficulty(converted.BeatmapInfo.BaseDifficulty);
+            if (Mods.Value.Any(m => m is IApplicableToDifficulty))
+            {
+                converted.BeatmapInfo = converted.BeatmapInfo.Clone();
+                converted.BeatmapInfo.BaseDifficulty = converted.BeatmapInfo.BaseDifficulty.Clone();
+
+                foreach (var mod in Mods.Value.OfType<IApplicableToDifficulty>())
+                    mod.ApplyToDifficulty(converted.BeatmapInfo.BaseDifficulty);
+            }
 
             // Post-process
             rulesetInstance.CreateBeatmapProcessor(converted)?.PostProcess();