Merge pull request #19597 from frenzibyte/hotfix-multi-spectator-resu…

…lts-screen

Fix multi-spectator potentially getting stuck for passed players (hotfix)

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

@@ -432,8 +432,8 @@ private void end(int userId)
             {
                 var user = playingUsers.Single(u => u.UserID == userId);
 
-                OnlinePlayDependencies.MultiplayerClient.RemoveUser(user.User.AsNonNull());
                 SpectatorClient.SendEndPlay(userId);
+                OnlinePlayDependencies.MultiplayerClient.RemoveUser(user.User.AsNonNull());
 
                 playingUsers.Remove(user);
             });

osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs

@@ -231,6 +231,12 @@ protected override void EndGameplay(int userId, SpectatorState state)
             if (state.State == SpectatedUserState.Passed || state.State == SpectatedUserState.Failed)
                 return;
 
+            // we could also potentially receive EndGameplay with "Playing" state, at which point we can only early-return and hope it's a passing player.
+            // todo: this shouldn't exist, but it's here as a hotfix for an issue with multi-spectator screen not proceeding to results screen.
+            // see: https://github.com/ppy/osu/issues/19593
+            if (state.State == SpectatedUserState.Playing)
+                return;
+
             RemoveUser(userId);
 
             var instance = instances.Single(i => i.UserId == userId);