From 9ade8069a1b7ded46328c023eeb119e26900d1ce Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 14 Dec 2021 16:52:57 +0900
Subject: [PATCH] Rename to AbortGameplay() and handle additional states

---
 osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs      | 2 +-
 osu.Game/Online/Multiplayer/MultiplayerClient.cs           | 2 +-
 osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs     | 4 ++--
 osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs     | 4 +++-
 osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
index 200539def7..073d512f90 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Online.Multiplayer
         /// <summary>
         /// Aborts an ongoing gameplay load.
         /// </summary>
-        Task AbortLoad();
+        Task AbortGameplay();
 
         /// <summary>
         /// Adds an item to the playlist.
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 78d8362170..ffb9e193d4 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -333,7 +333,7 @@ namespace osu.Game.Online.Multiplayer
 
         public abstract Task StartMatch();
 
-        public abstract Task AbortLoad();
+        public abstract Task AbortGameplay();
 
         public abstract Task AddPlaylistItem(MultiplayerPlaylistItem item);
 
diff --git a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
index 3062cf8b99..73b87190b1 100644
--- a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
@@ -154,12 +154,12 @@ namespace osu.Game.Online.Multiplayer
             return connection.InvokeAsync(nameof(IMultiplayerServer.StartMatch));
         }
 
-        public override Task AbortLoad()
+        public override Task AbortGameplay()
         {
             if (!IsConnected.Value)
                 return Task.CompletedTask;
 
-            return connection.InvokeAsync(nameof(IMultiplayerServer.AbortLoad));
+            return connection.InvokeAsync(nameof(IMultiplayerServer.AbortGameplay));
         }
 
         public override Task AddPlaylistItem(MultiplayerPlaylistItem item)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index c299fd285a..e136627d43 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -30,7 +30,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                     break;
 
                 case MultiplayerUserState.WaitingForLoad:
-                    client.AbortLoad();
+                case MultiplayerUserState.Loaded:
+                case MultiplayerUserState.Playing:
+                    client.AbortGameplay();
                     break;
 
                 default:
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 4c69f8f9d2..767751a808 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -317,7 +317,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             return ((IMultiplayerClient)this).LoadRequested();
         }
 
-        public override Task AbortLoad()
+        public override Task AbortGameplay()
         {
             Debug.Assert(Room != null);
             Debug.Assert(LocalUser != null);