From fbc316ea1d6cf401b0a3cf75ecb604b51f1c2211 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 27 May 2021 05:15:29 +0300
Subject: [PATCH] Fix legacy skin transformers potentially ignoring source
 implementations

---
 .../Legacy/CatchLegacySkinTransformer.cs      | 20 +++++++++++--------
 .../Legacy/ManiaLegacySkinTransformer.cs      |  8 +++++---
 .../Legacy/OsuLegacySkinTransformer.cs        |  7 ++++---
 .../Legacy/TaikoLegacySkinTransformer.cs      |  7 ++++---
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs
index 1b48832ed6..6efd9e88c4 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs
@@ -28,12 +28,15 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
                 {
                     case HUDSkinComponents.ComboCounter:
                         // catch may provide its own combo counter; hide the default.
-                        return providesComboCounter ? Drawable.Empty() : null;
+                        if (providesComboCounter)
+                            return Drawable.Empty();
+
+                        break;
                 }
             }
 
             if (!(component is CatchSkinComponent catchSkinComponent))
-                return null;
+                return Source.GetDrawableComponent(component);
 
             switch (catchSkinComponent.Component)
             {
@@ -41,19 +44,19 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
                     if (GetTexture("fruit-pear") != null)
                         return new LegacyFruitPiece();
 
-                    break;
+                    return null;
 
                 case CatchSkinComponents.Banana:
                     if (GetTexture("fruit-bananas") != null)
                         return new LegacyBananaPiece();
 
-                    break;
+                    return null;
 
                 case CatchSkinComponents.Droplet:
                     if (GetTexture("fruit-drop") != null)
                         return new LegacyDropletPiece();
 
-                    break;
+                    return null;
 
                 case CatchSkinComponents.CatcherIdle:
                     return this.GetAnimation("fruit-catcher-idle", true, true, true) ??
@@ -71,10 +74,11 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
                     if (providesComboCounter)
                         return new LegacyCatchComboCounter(Source);
 
-                    break;
-            }
+                    return null;
 
-            return null;
+                default:
+                    return Source.GetDrawableComponent(component);
+            }
         }
 
         public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
index 24ccae895d..6617fcefe7 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
@@ -120,12 +120,14 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 
                         case ManiaSkinComponents.StageForeground:
                             return new LegacyStageForeground();
+
+                        default:
+                            return Source.GetDrawableComponent(component);
                     }
 
-                    break;
+                default:
+                    return Source.GetDrawableComponent(component);
             }
-
-            return null;
         }
 
         private Drawable getResult(HitResult result)
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index 88302ebc57..f1376551f5 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         public override Drawable GetDrawableComponent(ISkinComponent component)
         {
             if (!(component is OsuSkinComponent osuComponent))
-                return null;
+                return Source.GetDrawableComponent(component);
 
             switch (osuComponent.Component)
             {
@@ -115,9 +115,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         return new LegacyOldStyleSpinner();
 
                     return null;
-            }
 
-            return null;
+                default:
+                    return Source.GetDrawableComponent(component);
+            }
         }
 
         public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
index 3e506f69ce..05778a80ef 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             }
 
             if (!(component is TaikoSkinComponent taikoComponent))
-                return null;
+                return Source.GetDrawableComponent(component);
 
             switch (taikoComponent.Component)
             {
@@ -130,9 +130,10 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 
                 case TaikoSkinComponents.Mascot:
                     return new DrawableTaikoMascot();
-            }
 
-            return Source.GetDrawableComponent(component);
+                default:
+                    return Source.GetDrawableComponent(component);
+            }
         }
 
         private string getHitName(TaikoSkinComponents component)