diff --git a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs index cb80c93ef9..afaf1e89de 100644 --- a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs +++ b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs @@ -87,11 +87,5 @@ namespace osu.Game.Online.Multiplayer /// /// The item to add. Task AddPlaylistItem(MultiplayerPlaylistItem item); - - /// - /// Removes an item from the playlist. - /// - /// The item to remove. - Task RemovePlaylistItem(long playlistItemId); } } diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs index ebbd76f237..77a1b51b7d 100644 --- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs +++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs @@ -311,8 +311,6 @@ namespace osu.Game.Online.Multiplayer public abstract Task AddPlaylistItem(MultiplayerPlaylistItem item); - public abstract Task RemovePlaylistItem(long playlistItemId); - Task IMultiplayerClient.RoomStateChanged(MultiplayerRoomState state) { if (Room == null) diff --git a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs index 5c60dae747..2609436890 100644 --- a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs +++ b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs @@ -168,14 +168,6 @@ namespace osu.Game.Online.Multiplayer return connection.InvokeAsync(nameof(IMultiplayerServer.AddPlaylistItem), item); } - public override Task RemovePlaylistItem(long playlistItemId) - { - if (!IsConnected.Value) - return Task.CompletedTask; - - return connection.InvokeAsync(nameof(IMultiplayerServer.RemovePlaylistItem), playlistItemId); - } - protected override Task GetOnlineBeatmapSet(int beatmapId, CancellationToken cancellationToken = default) { var tcs = new TaskCompletionSource(); diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs index a88bf56cee..e2dff61e7c 100644 --- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs +++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs @@ -330,16 +330,6 @@ namespace osu.Game.Tests.Visual.Multiplayer } } - public override Task RemovePlaylistItem(long playlistItemId) - { - Debug.Assert(Room != null); - - if (Room.Host?.UserID != LocalUser?.UserID) - throw new InvalidOperationException("Local user is not the room host."); - - return ((IMultiplayerClient)this).PlaylistItemRemoved(playlistItemId); - } - protected override Task GetOnlineBeatmapSet(int beatmapId, CancellationToken cancellationToken = default) { Debug.Assert(Room != null);