From 315eea8d9ade4e2b2f23a4d1cfa4214670fe45c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 3 Sep 2025 09:52:37 +0200
Subject: [PATCH] Simplify beatmap access in carousel panels

---
 osu.Game/Screens/SelectV2/PanelBeatmap.cs      | 18 ++----------------
 .../Screens/SelectV2/PanelBeatmapStandalone.cs | 17 ++---------------
 2 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Screens/SelectV2/PanelBeatmap.cs b/osu.Game/Screens/SelectV2/PanelBeatmap.cs
index 545439684b..7dfd82cd1f 100644
--- a/osu.Game/Screens/SelectV2/PanelBeatmap.cs
+++ b/osu.Game/Screens/SelectV2/PanelBeatmap.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -72,14 +71,7 @@ namespace osu.Game.Screens.SelectV2
         [Resolved]
         private ISongSelect? songSelect { get; set; }
 
-        private GroupedBeatmap groupedBeatmap
-        {
-            get
-            {
-                Debug.Assert(Item != null);
-                return (GroupedBeatmap)Item!.Model;
-            }
-        }
+        private BeatmapInfo beatmap => ((GroupedBeatmap)Item!.Model).Beatmap;
 
         public PanelBeatmap()
         {
@@ -216,8 +208,6 @@ namespace osu.Game.Screens.SelectV2
         {
             base.PrepareForUse();
 
-            var beatmap = groupedBeatmap.Beatmap;
-
             difficultyIcon.Icon = getRulesetIcon(beatmap.Ruleset);
 
             localRank.Beatmap = beatmap;
@@ -256,8 +246,6 @@ namespace osu.Game.Screens.SelectV2
             if (Item == null)
                 return;
 
-            var beatmap = groupedBeatmap.Beatmap;
-
             starDifficultyBindable = difficultyCache.GetBindableDifficulty(beatmap, starDifficultyCancellationSource.Token, SongSelect.SELECTION_DEBOUNCE);
             starDifficultyBindable.BindValueChanged(starDifficulty =>
             {
@@ -301,8 +289,6 @@ namespace osu.Game.Screens.SelectV2
             if (Item == null)
                 return;
 
-            var beatmap = groupedBeatmap.Beatmap;
-
             if (ruleset.Value.OnlineID == 3)
             {
                 // Account for mania differences locally for now.
@@ -327,7 +313,7 @@ namespace osu.Game.Screens.SelectV2
                 List<MenuItem> items = new List<MenuItem>();
 
                 if (songSelect != null)
-                    items.AddRange(songSelect.GetForwardActions(groupedBeatmap.Beatmap));
+                    items.AddRange(songSelect.GetForwardActions(beatmap));
 
                 return items.ToArray();
             }
diff --git a/osu.Game/Screens/SelectV2/PanelBeatmapStandalone.cs b/osu.Game/Screens/SelectV2/PanelBeatmapStandalone.cs
index 226a1b1d06..b54eecd548 100644
--- a/osu.Game/Screens/SelectV2/PanelBeatmapStandalone.cs
+++ b/osu.Game/Screens/SelectV2/PanelBeatmapStandalone.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -73,14 +72,7 @@ namespace osu.Game.Screens.SelectV2
 
         private Box backgroundBorder = null!;
 
-        private GroupedBeatmap groupedBeatmap
-        {
-            get
-            {
-                Debug.Assert(Item != null);
-                return (GroupedBeatmap)Item!.Model;
-            }
-        }
+        private BeatmapInfo beatmap => ((GroupedBeatmap)Item!.Model).Beatmap;
 
         public PanelBeatmapStandalone()
         {
@@ -228,7 +220,6 @@ namespace osu.Game.Screens.SelectV2
         {
             base.PrepareForUse();
 
-            var beatmap = groupedBeatmap.Beatmap;
             var beatmapSet = beatmap.BeatmapSet!;
 
             beatmapBackground.Beatmap = beatmaps.GetWorkingBeatmap(beatmap);
@@ -269,8 +260,6 @@ namespace osu.Game.Screens.SelectV2
             if (Item == null)
                 return;
 
-            var beatmap = groupedBeatmap.Beatmap;
-
             starDifficultyBindable = difficultyCache.GetBindableDifficulty(beatmap, starDifficultyCancellationSource.Token, SongSelect.SELECTION_DEBOUNCE);
             starDifficultyBindable.BindValueChanged(starDifficulty =>
             {
@@ -307,8 +296,6 @@ namespace osu.Game.Screens.SelectV2
             if (Item == null)
                 return;
 
-            var beatmap = groupedBeatmap.Beatmap;
-
             if (ruleset.Value.OnlineID == 3)
             {
                 // Account for mania differences locally for now.
@@ -333,7 +320,7 @@ namespace osu.Game.Screens.SelectV2
                 List<MenuItem> items = new List<MenuItem>();
 
                 if (songSelect != null)
-                    items.AddRange(songSelect.GetForwardActions(groupedBeatmap.Beatmap));
+                    items.AddRange(songSelect.GetForwardActions(beatmap));
 
                 return items.ToArray();
             }