From 158f0a1f233d14234ddc999dfe6b5d763f41e733 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Jun 2022 17:38:34 +0900
Subject: [PATCH] Remove remaining `Room!=null` checks in
 `TestMultiplayerClient` where possible

---
 .../Visual/Multiplayer/TestMultiplayerClient.cs     | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index f2024a3107..6b7495762a 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -87,8 +87,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
             switch (Room?.MatchState)
             {
                 case TeamVersusRoomState teamVersus:
-                    Debug.Assert(Room != null);
-
                     // simulate the server's automatic assignment of users to teams on join.
                     // the "best" team is the one with the least users on it.
                     int bestTeam = teamVersus.Teams
@@ -103,6 +101,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         public void RemoveUser(APIUser user)
         {
             Debug.Assert(Room != null);
+
             ((IMultiplayerClient)this).UserLeft(new MultiplayerRoomUser(user.Id));
 
             Schedule(() =>
@@ -114,25 +113,23 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public void ChangeRoomState(MultiplayerRoomState newState)
         {
-            Debug.Assert(Room != null);
             ((IMultiplayerClient)this).RoomStateChanged(newState);
         }
 
         public void ChangeUserState(int userId, MultiplayerUserState newState)
         {
-            Debug.Assert(Room != null);
-
             ((IMultiplayerClient)this).UserStateChanged(userId, newState);
             updateRoomStateIfRequired();
         }
 
         private void updateRoomStateIfRequired()
         {
-            Debug.Assert(Room != null);
             Debug.Assert(APIRoom != null);
 
             Schedule(() =>
             {
+                Debug.Assert(Room != null);
+
                 switch (Room.State)
                 {
                     case MultiplayerRoomState.Open:
@@ -179,8 +176,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public void ChangeUserBeatmapAvailability(int userId, BeatmapAvailability newBeatmapAvailability)
         {
-            Debug.Assert(Room != null);
-
             ((IMultiplayerClient)this).UserBeatmapAvailabilityChanged(userId, newBeatmapAvailability);
         }
 
@@ -290,7 +285,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public void ChangeUserMods(int userId, IEnumerable<APIMod> newMods)
         {
-            Debug.Assert(Room != null);
             ((IMultiplayerClient)this).UserModsChanged(userId, newMods.ToList());
         }
 
@@ -338,7 +332,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public override Task AbortGameplay()
         {
-            Debug.Assert(Room != null);
             Debug.Assert(LocalUser != null);
 
             ChangeUserState(LocalUser.UserID, MultiplayerUserState.Idle);