From 277f4268db271250a43cdb46bcdd45ae7bb98b9d Mon Sep 17 00:00:00 2001
From: marvin <minetoblend@gmail.com>
Date: Tue, 18 Nov 2025 19:33:59 +0100
Subject: [PATCH] Remove `BeatmapSelectGrid.RevealRandomItem` method

---
 .../Matchmaking/TestSceneBeatmapSelectGrid.cs    |  2 --
 .../Match/BeatmapSelect/BeatmapSelectGrid.cs     | 10 ----------
 .../BeatmapSelect/SubScreenBeatmapSelect.cs      | 16 ----------------
 3 files changed, 28 deletions(-)

diff --git a/osu.Game.Tests/Visual/Matchmaking/TestSceneBeatmapSelectGrid.cs b/osu.Game.Tests/Visual/Matchmaking/TestSceneBeatmapSelectGrid.cs
index c2c4b6a797..f2448a5e26 100644
--- a/osu.Game.Tests/Visual/Matchmaking/TestSceneBeatmapSelectGrid.cs
+++ b/osu.Game.Tests/Visual/Matchmaking/TestSceneBeatmapSelectGrid.cs
@@ -8,7 +8,6 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
-using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -194,7 +193,6 @@ namespace osu.Game.Tests.Visual.Matchmaking
                 Scheduler.AddDelayed(() =>
                 {
                     grid.PresentRolledBeatmap(finalItem, MatchmakingCandidateType.Random);
-                    grid.RevealRandomItem(items[RNG.Next(items.Length)].PlaylistItem);
                 }, 500);
             });
         }
diff --git a/osu.Game/Screens/OnlinePlay/Matchmaking/Match/BeatmapSelect/BeatmapSelectGrid.cs b/osu.Game/Screens/OnlinePlay/Matchmaking/Match/BeatmapSelect/BeatmapSelectGrid.cs
index 5da2546745..f5796fe760 100644
--- a/osu.Game/Screens/OnlinePlay/Matchmaking/Match/BeatmapSelect/BeatmapSelectGrid.cs
+++ b/osu.Game/Screens/OnlinePlay/Matchmaking/Match/BeatmapSelect/BeatmapSelectGrid.cs
@@ -141,16 +141,6 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match.BeatmapSelect
                 panel.RemoveUser(user);
         });
 
-        public void RevealRandomItem(MultiplayerPlaylistItem item) => whenPanelsLoaded(() =>
-        {
-            playlistItems.TryGetValue(item.ID, out var playlistItem);
-
-            Debug.Assert(playlistItem != null);
-
-            // TODO: make this happen via panel.PresentAsChosenBeatmap
-            // randomPanel.RevealBeatmap(playlistItem.Beatmap, playlistItem.Mods);
-        });
-
         public void RollAndDisplayFinalBeatmap(long[] candidateItemIds, long finalItemId, MatchmakingCandidateType candidateType) => whenPanelsLoaded(() =>
         {
             Debug.Assert(candidateItemIds.Length >= 1);
diff --git a/osu.Game/Screens/OnlinePlay/Matchmaking/Match/BeatmapSelect/SubScreenBeatmapSelect.cs b/osu.Game/Screens/OnlinePlay/Matchmaking/Match/BeatmapSelect/SubScreenBeatmapSelect.cs
index c9cfa74e3e..5f6886d23a 100644
--- a/osu.Game/Screens/OnlinePlay/Matchmaking/Match/BeatmapSelect/SubScreenBeatmapSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Matchmaking/Match/BeatmapSelect/SubScreenBeatmapSelect.cs
@@ -79,7 +79,6 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match.BeatmapSelect
             beatmapSelectGrid.ItemSelected += item => client.MatchmakingToggleSelection(item.ID);
             client.MatchmakingItemSelected += onItemSelected;
             client.MatchmakingItemDeselected += onItemDeselected;
-            client.SettingsChanged += onSettingsChanged;
 
             Debug.Assert(client.Room != null);
 
@@ -136,20 +135,6 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match.BeatmapSelect
             beatmapSelectGrid.SetUserSelection(user, itemId, false);
         }
 
-        private void onSettingsChanged(MultiplayerRoomSettings settings)
-        {
-            if (client.Room!.MatchState is not MatchmakingRoomState matchmakingState)
-                return;
-
-            if (matchmakingState.Stage != MatchmakingStage.ServerBeatmapFinalised)
-                return;
-
-            if (matchmakingState.CandidateItem != -1)
-                return;
-
-            beatmapSelectGrid.RevealRandomItem(client.Room!.CurrentPlaylistItem);
-        }
-
         public void RollFinalBeatmap(long[] candidateItems, long finalItem, MatchmakingCandidateType panelType) =>
             beatmapSelectGrid.RollAndDisplayFinalBeatmap(candidateItems, finalItem, panelType);
 
@@ -161,7 +146,6 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match.BeatmapSelect
             {
                 client.MatchmakingItemSelected -= onItemSelected;
                 client.MatchmakingItemDeselected -= onItemDeselected;
-                client.SettingsChanged -= onSettingsChanged;
             }
         }
     }