From 36e1fb6da80a1416900d07ae9c69c9b12e8876ff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Mar 2021 14:04:00 +0900
Subject: [PATCH] Add flow to allow MatchSubScreen to handle beatmap
 presentation locally

---
 osu.Game/OsuGame.cs                           | 13 ++++++++++---
 osu.Game/PerformFromMenuRunner.cs             |  7 +------
 .../Multiplayer/MultiplayerMatchSongSelect.cs | 19 +++++++++++++++++++
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 12 +++++++++++-
 4 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 771bcd2310..1e0cb587e9 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -381,9 +381,16 @@ namespace osu.Game
                                 ?? beatmaps.FirstOrDefault(b => b.Ruleset.Equals(Ruleset.Value))
                                 ?? beatmaps.First();
 
-                Ruleset.Value = selection.Ruleset;
-                Beatmap.Value = BeatmapManager.GetWorkingBeatmap(selection);
-            }, validScreens: new[] { typeof(SongSelect) });
+                if (screen is IHandlePresentBeatmap presentableScreen)
+                {
+                    presentableScreen.PresentBeatmap(BeatmapManager.GetWorkingBeatmap(selection), selection.Ruleset);
+                }
+                else
+                {
+                    Ruleset.Value = selection.Ruleset;
+                    Beatmap.Value = BeatmapManager.GetWorkingBeatmap(selection);
+                }
+            }, validScreens: new[] { typeof(SongSelect), typeof(IHandlePresentBeatmap) });
         }
 
         /// <summary>
diff --git a/osu.Game/PerformFromMenuRunner.cs b/osu.Game/PerformFromMenuRunner.cs
index fe75a3a607..6f979b8dc8 100644
--- a/osu.Game/PerformFromMenuRunner.cs
+++ b/osu.Game/PerformFromMenuRunner.cs
@@ -5,11 +5,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Framework.Threading;
-using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Dialog;
 using osu.Game.Overlays.Notifications;
@@ -30,9 +28,6 @@ namespace osu.Game
         [Resolved]
         private DialogOverlay dialogOverlay { get; set; }
 
-        [Resolved]
-        private IBindable<WorkingBeatmap> beatmap { get; set; }
-
         [Resolved(canBeNull: true)]
         private OsuGame game { get; set; }
 
@@ -90,7 +85,7 @@ namespace osu.Game
             var type = current.GetType();
 
             // check if we are already at a valid target screen.
-            if (validScreens.Any(t => t.IsAssignableFrom(type)) && !beatmap.Disabled)
+            if (validScreens.Any(t => t.IsAssignableFrom(type)))
             {
                 finalAction(current);
                 Cancel();
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index f17d97c3fd..c9f0f6de90 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -4,9 +4,11 @@
 using osu.Framework.Allocation;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Select;
 
@@ -19,6 +21,23 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private LoadingLayer loadingLayer;
 
+        /// <summary>
+        /// Construct a new instance of multiplayer song select.
+        /// </summary>
+        /// <param name="beatmap">An optional initial beatmap selection to perform.</param>
+        /// <param name="ruleset">An optional initial ruleset selection to perform.</param>
+        public MultiplayerMatchSongSelect(WorkingBeatmap beatmap = null, RulesetInfo ruleset = null)
+        {
+            if (beatmap != null || ruleset != null)
+            {
+                Schedule(() =>
+                {
+                    if (beatmap != null) Beatmap.Value = beatmap;
+                    if (ruleset != null) Ruleset.Value = ruleset;
+                });
+            }
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 4fbea4e3be..06d83e495c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -12,9 +12,11 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Framework.Threading;
+using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.OnlinePlay.Match;
@@ -29,7 +31,7 @@ using ParticipantsList = osu.Game.Screens.OnlinePlay.Multiplayer.Participants.Pa
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     [Cached]
-    public class MultiplayerMatchSubScreen : RoomSubScreen
+    public class MultiplayerMatchSubScreen : RoomSubScreen, IHandlePresentBeatmap
     {
         public override string Title { get; }
 
@@ -394,5 +396,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             modSettingChangeTracker?.Dispose();
         }
+
+        public void PresentBeatmap(WorkingBeatmap beatmap, RulesetInfo ruleset)
+        {
+            if (!this.IsCurrentScreen())
+                return;
+
+            this.Push(new MultiplayerMatchSongSelect(beatmap, ruleset));
+        }
     }
 }