Merge pull request #29427 from frenzibyte/fix-ruleset-components-beat…

…map-skin Fix beatmap skin always overriding ruleset HUD components
ppy · Aug 15, 2024 · e7b4a2f · e7b4a2f
2 parents 4b279ec + 49c71f7
commit e7b4a2f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs
@@ -43,6 +43,10 @@ public CatchLegacySkinTransformer(ISkin skin)
  if (base.GetDrawableComponent(lookup) is UserConfiguredLayoutContainer d)
  return d;
 
+ // we don't have enough assets to display these components (this is especially the case on a "beatmap" skin).
+ if (!IsProvidingLegacyResources)
+ return null;
+
  // Our own ruleset components default.
  // todo: remove CatchSkinComponents.CatchComboCounter and refactor LegacyCatchComboCounter to be added here instead.
  return new DefaultSkinComponentsContainer(container =>

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -53,6 +53,10 @@ public OsuLegacySkinTransformer(ISkin skin)
  if (base.GetDrawableComponent(lookup) is UserConfiguredLayoutContainer d)
  return d;
 
+ // we don't have enough assets to display these components (this is especially the case on a "beatmap" skin).
+ if (!IsProvidingLegacyResources)
+ return null;
+
  // Our own ruleset components default.
  switch (containerLookup.Target)
  {