From 7845d542e3b63d86c2c9364c14021bbd9c96a239 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Apr 2019 17:11:17 +0900
Subject: [PATCH] Cache mods as array in DrawableRuleset

---
 osu.Game/Rulesets/UI/DrawableRuleset.cs | 11 +++++------
 osu.Game/Rulesets/UI/Playfield.cs       |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 0ab07de1ac..654f330a08 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -81,9 +81,8 @@ namespace osu.Game.Rulesets.UI
         /// <summary>
         /// The mods which are to be applied.
         /// </summary>
-        [Cached]
-        [Cached(typeof(IBindable<IEnumerable<Mod>>))]
-        private readonly Bindable<IEnumerable<Mod>> mods = new Bindable<IEnumerable<Mod>>();
+        [Cached(typeof(IReadOnlyList<Mod>))]
+        private readonly IReadOnlyList<Mod> mods;
 
         private FrameStabilityContainer frameStabilityContainer;
 
@@ -100,7 +99,7 @@ namespace osu.Game.Rulesets.UI
             if (workingBeatmap == null)
                 throw new ArgumentException("Beatmap cannot be null.", nameof(workingBeatmap));
 
-            this.mods.Value = mods;
+            this.mods = mods.ToArray();
 
             RelativeSizeAxes = Axes.Both;
 
@@ -160,7 +159,7 @@ namespace osu.Game.Rulesets.UI
                         .WithChild(ResumeOverlay)));
             }
 
-            applyRulesetMods(mods.Value, config);
+            applyRulesetMods(mods, config);
 
             loadObjects();
         }
@@ -175,7 +174,7 @@ namespace osu.Game.Rulesets.UI
 
             Playfield.PostProcess();
 
-            foreach (var mod in mods.Value.OfType<IApplicableToDrawableHitObjects>())
+            foreach (var mod in mods.OfType<IApplicableToDrawableHitObjects>())
                 mod.ApplyToDrawableHitObjects(Playfield.HitObjectContainer.Objects);
         }
 
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index c9a05dae2c..13689153f0 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.UI
         private IBindable<WorkingBeatmap> beatmap { get; set; }
 
         [Resolved]
-        private IBindable<IEnumerable<Mod>> mods { get; set; }
+        private IReadOnlyList<Mod> mods { get; set; }
 
         [BackgroundDependencyLoader]
         private void load()
@@ -125,7 +125,7 @@ namespace osu.Game.Rulesets.UI
             base.Update();
 
             if (beatmap != null)
-                foreach (var mod in mods.Value)
+                foreach (var mod in mods)
                     if (mod is IUpdatableByPlayfield updatable)
                         updatable.Update(this);
         }