From c51bad0e35e4a08d3e0e159e103884bbf709e85d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 13 Apr 2020 13:42:21 +0900
Subject: [PATCH] Cache ManiaPlayfield instead

---
 .../Objects/Drawables/DrawableManiaHitObject.cs          | 9 +++------
 osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs             | 2 ++
 osu.Game/Rulesets/UI/Playfield.cs                        | 1 -
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
index a708adb493..88888001b4 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.Mania.UI;
-using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -27,18 +26,16 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         protected readonly IBindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
 
         [Resolved(canBeNull: true)]
-        private Playfield playfield { get; set; }
+        private ManiaPlayfield playfield { get; set; }
 
         protected override float SamplePlaybackPosition
         {
             get
             {
-                var columns = (playfield as ManiaPlayfield)?.TotalColumns;
-
-                if (columns == null)
+                if (playfield == null)
                     return base.SamplePlaybackPosition;
 
-                return (float)HitObject.Column / columns.Value;
+                return (float)HitObject.Column / playfield.TotalColumns;
             }
         }
 
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
index c2eb48b774..2dec468654 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics.Containers;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -14,6 +15,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
+    [Cached]
     public class ManiaPlayfield : ScrollingPlayfield
     {
         private readonly List<Stage> stages = new List<Stage>();
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index fc6906560b..c52183f3f2 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -15,7 +15,6 @@ using osuTK;
 
 namespace osu.Game.Rulesets.UI
 {
-    [Cached]
     public abstract class Playfield : CompositeDrawable
     {
         /// <summary>