From 7c7f15089a6ee06b3e244fc03db8e7114e165cca Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 17:42:23 +0900
Subject: [PATCH] Make CreateRoomManager return the drawable version

---
 osu.Game/Screens/Multi/Multiplayer.cs                    | 8 ++++----
 osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 5f61c5e635..837ccdf2e9 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Screens.Multi
         private readonly IBindable<bool> isIdle = new BindableBool();
 
         [Cached(Type = typeof(IRoomManager))]
-        protected IRoomManager RoomManager { get; private set; }
+        protected RoomManager RoomManager { get; private set; }
 
         [Cached]
         private readonly Bindable<Room> selectedRoom = new Bindable<Room>();
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Multi
             InternalChild = waves = new MultiplayerWaveContainer
             {
                 RelativeSizeAxes = Axes.Both,
-                Children = new[]
+                Children = new Drawable[]
                 {
                     new Box
                     {
@@ -136,7 +136,7 @@ namespace osu.Game.Screens.Multi
                         Origin = Anchor.TopRight,
                         Action = () => CreateRoom()
                     },
-                    (Drawable)(RoomManager = CreateRoomManager())
+                    RoomManager = CreateRoomManager()
                 }
             };
 
@@ -353,7 +353,7 @@ namespace osu.Game.Screens.Multi
             }
         }
 
-        protected abstract IRoomManager CreateRoomManager();
+        protected abstract RoomManager CreateRoomManager();
 
         private class MultiplayerWaveContainer : WaveContainer
         {
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
index 1ff9c670a8..d2d6a35a2e 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Logging;
 using osu.Framework.Screens;
+using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Match;
 
@@ -43,6 +44,6 @@ namespace osu.Game.Screens.Multi.Timeshift
             Logger.Log($"Polling adjusted (listing: {timeshiftManager.TimeBetweenListingPolls.Value}, selection: {timeshiftManager.TimeBetweenSelectionPolls.Value})");
         }
 
-        protected override IRoomManager CreateRoomManager() => new TimeshiftRoomManager();
+        protected override RoomManager CreateRoomManager() => new TimeshiftRoomManager();
     }
 }