Apply refactorings according to reviews

osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs

@@ -282,12 +282,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
                 int countReady = room.Users.Count(u => u.State == MultiplayerUserState.Ready);
                 int countTotal = room.Users.Count(u => u.State != MultiplayerUserState.Spectating);
-
-                string countdownText = room.Countdown == null ? string.Empty : $"Starting in {room.Countdown.EndTime - DateTimeOffset.Now:mm\\:ss}";
                 string countText = $"({countReady} / {countTotal} ready)";
 
                 if (room.Countdown != null)
                 {
+                    string countdownText = $"Starting in {room.Countdown.EndTime - DateTimeOffset.Now:mm\\:ss}";
+
                     switch (localUser?.State)
                     {
                         default:
@@ -329,8 +329,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
                 var localUser = multiplayerClient.LocalUser;
 
-                if (room.Countdown != null)
-                {
                 switch (localUser?.State)
                 {
                     default:
@@ -339,28 +337,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
                     case MultiplayerUserState.Spectating:
                     case MultiplayerUserState.Ready:
-                            setYellow();
+                        if (room?.Host?.Equals(localUser) == true && room.Countdown == null)
-                            break;
-                    }
-                }
-                else
-                {
-                    switch (localUser?.State)
-                    {
-                        default:
-                            setGreen();
-                            break;
-
-                        case MultiplayerUserState.Spectating:
-                        case MultiplayerUserState.Ready:
-                            if (room?.Host?.Equals(localUser) == true)
                             setGreen();
                         else
                             setYellow();
 
                         break;
                 }
-                }
 
                 void setYellow()
                 {

osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs

@@ -321,14 +321,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     countdownTask = start();
 
                     async Task start()
-                    {
-                        try
                     {
                         await lastCountdownTask;
-                        }
-                        catch (OperationCanceledException)
-                        {
-                        }
 
                         Schedule(() =>
                         {