diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
index 807ea74404..45ac7e25d3 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
@@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Specialized;
+using System.Diagnostics;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
@@ -199,7 +200,14 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e) => SelectedItem.Value = Playlist.FirstOrDefault();
- private void onLoadRequested() => multiplayer?.Push(new PlayerLoader(() => new RealtimePlayer(SelectedItem.Value)));
+ private void onLoadRequested()
+ {
+ Debug.Assert(client.Room != null);
+
+ int[] userIds = client.Room.Users.Where(u => u.State >= MultiplayerUserState.WaitingForLoad).Select(u => u.UserID).ToArray();
+
+ multiplayer?.Push(new PlayerLoader(() => new RealtimePlayer(SelectedItem.Value, userIds)));
+ }
protected override void Dispose(bool isDisposing)
{
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index f16f558651..085c52cb85 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -3,7 +3,6 @@
using System;
using System.Diagnostics;
-using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using JetBrains.Annotations;
@@ -39,9 +38,17 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
[CanBeNull]
private MultiplayerGameplayLeaderboard leaderboard;
- public RealtimePlayer(PlaylistItem playlistItem)
+ private readonly int[] userIds;
+
+ ///
+ /// Construct a multiplayer player.
+ ///
+ /// The playlist item to be played.
+ /// The users which are participating in this game.
+ public RealtimePlayer(PlaylistItem playlistItem, int[] userIds)
: base(playlistItem, false)
{
+ this.userIds = userIds;
}
[BackgroundDependencyLoader]
@@ -74,8 +81,6 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
Debug.Assert(client.Room != null);
- int[] userIds = client.Room.Users.Where(u => u.State >= MultiplayerUserState.WaitingForLoad).Select(u => u.UserID).ToArray();
-
// todo: this should be implemented via a custom HUD implementation, and correctly masked to the main content area.
LoadComponentAsync(leaderboard = new MultiplayerGameplayLeaderboard(ScoreProcessor, userIds), HUDOverlay.Add);
}