From 08701b5eab700ea2944cf358cd60616d8fe9c96a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 7 Jun 2021 23:23:10 +0900
Subject: [PATCH] Ensure all lookups in `LegacyHealthDisplay` use the found
 provider

Not actually needed to fix the remaining issue but does feel better
---
 osu.Game/Skinning/LegacyHealthDisplay.cs | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
index 5a5c7f11ea..9d3bafd0b1 100644
--- a/osu.Game/Skinning/LegacyHealthDisplay.cs
+++ b/osu.Game/Skinning/LegacyHealthDisplay.cs
@@ -20,9 +20,6 @@ namespace osu.Game.Skinning
     {
         private const double epic_cutoff = 0.5;
 
-        [Resolved]
-        private ISkinSource skin { get; set; }
-
         private LegacyHealthPiece fill;
         private LegacyHealthPiece marker;
 
@@ -31,14 +28,14 @@ namespace osu.Game.Skinning
         private bool isNewStyle;
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(ISkinSource source)
         {
             AutoSizeAxes = Axes.Both;
 
-            var backgroundSource = skin.FindProvider(s => getTexture(s, "bg") != null);
+            var skin = source.FindProvider(s => getTexture(s, "bg") != null);
 
             // the marker lookup to decide which display style must be performed on the source of the bg, which is the most common element.
-            isNewStyle = getTexture(backgroundSource, "marker") != null;
+            isNewStyle = getTexture(skin, "marker") != null;
 
             // background implementation is the same for both versions.
             AddInternal(new Sprite { Texture = getTexture(skin, "bg") });
@@ -98,7 +95,7 @@ namespace osu.Game.Skinning
             private readonly Texture dangerTexture;
             private readonly Texture superDangerTexture;
 
-            public LegacyOldStyleMarker(ISkinSource skin)
+            public LegacyOldStyleMarker(ISkin skin)
             {
                 normalTexture = getTexture(skin, "ki");
                 dangerTexture = getTexture(skin, "kidanger");
@@ -129,9 +126,9 @@ namespace osu.Game.Skinning
 
         public class LegacyNewStyleMarker : LegacyMarker
         {
-            private readonly ISkinSource skin;
+            private readonly ISkin skin;
 
-            public LegacyNewStyleMarker(ISkinSource skin)
+            public LegacyNewStyleMarker(ISkin skin)
             {
                 this.skin = skin;
             }
@@ -153,7 +150,7 @@ namespace osu.Game.Skinning
 
         internal class LegacyOldStyleFill : LegacyHealthPiece
         {
-            public LegacyOldStyleFill(ISkinSource skin)
+            public LegacyOldStyleFill(ISkin skin)
             {
                 // required for sizing correctly..
                 var firstFrame = getTexture(skin, "colour-0");
@@ -176,7 +173,7 @@ namespace osu.Game.Skinning
 
         internal class LegacyNewStyleFill : LegacyHealthPiece
         {
-            public LegacyNewStyleFill(ISkinSource skin)
+            public LegacyNewStyleFill(ISkin skin)
             {
                 InternalChild = new Sprite
                 {