diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs index a5116cf2dd..2f11ab94b3 100644 --- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs +++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs @@ -860,15 +860,18 @@ namespace osu.Game.Tests.Visual.Multiplayer public async Task PlayUserCard(int userId, Func selector) { RankedPlayCardItem card = selector(((RankedPlayRoomState)ServerRoom!.MatchState!).Users[userId].Hand.ToArray()); - MultiplayerPlaylistItem item = GetCardWithPlaylistItem(card).PlaylistItem.Value!; + MultiplayerPlaylistItem? item = GetCardWithPlaylistItem(card).PlaylistItem.Value; - ServerRoom!.Playlist.Add(item); - await ((IMultiplayerClient)this).PlaylistItemAdded(clone(item)).ConfigureAwait(false); - await ((IMultiplayerClient)this).PlaylistItemChanged(clone(item)).ConfigureAwait(false); + if (item != null) + { + ServerRoom!.Playlist.Add(item); + await ((IMultiplayerClient)this).PlaylistItemAdded(clone(item)).ConfigureAwait(false); + await ((IMultiplayerClient)this).PlaylistItemChanged(clone(item)).ConfigureAwait(false); - var settings = clone(ServerRoom!.Settings); - settings.PlaylistItemId = item.ID; - await ((IMultiplayerClient)this).SettingsChanged(settings).ConfigureAwait(false); + var settings = clone(ServerRoom!.Settings); + settings.PlaylistItemId = item.ID; + await ((IMultiplayerClient)this).SettingsChanged(settings).ConfigureAwait(false); + } await ((IRankedPlayClient)this).RankedPlayCardPlayed(clone(card)).ConfigureAwait(false); }