h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 06:42:56 +08:00
Code Issues Releases Wiki Activity

Remove RemovePlaylistItem() server method for the time being

Browse Source
This commit is contained in:
Dan Balasescu 2021-11-16 12:08:53 +09:00
parent 459e819a5d
commit f0593115b2
4 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
View File

@ -87,11 +87,5 @@ namespace osu.Game.Online.Multiplayer
/// </summary> /// </summary>
/// <param name="item">The item to add.</param> /// <param name="item">The item to add.</param>
Task AddPlaylistItem(MultiplayerPlaylistItem item); Task AddPlaylistItem(MultiplayerPlaylistItem item);
/// <summary>
/// Removes an item from the playlist.
/// </summary>
/// <param name="playlistItemId">The item to remove.</param>
Task RemovePlaylistItem(long playlistItemId);
} }
} }

2
osu.Game/Online/Multiplayer/MultiplayerClient.cs
View File

@ -311,8 +311,6 @@ namespace osu.Game.Online.Multiplayer
public abstract Task AddPlaylistItem(MultiplayerPlaylistItem item); public abstract Task AddPlaylistItem(MultiplayerPlaylistItem item);
public abstract Task RemovePlaylistItem(long playlistItemId);
Task IMultiplayerClient.RoomStateChanged(MultiplayerRoomState state) Task IMultiplayerClient.RoomStateChanged(MultiplayerRoomState state)
{ {
if (Room == null) if (Room == null)

8
osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
View File

@ -168,14 +168,6 @@ namespace osu.Game.Online.Multiplayer
return connection.InvokeAsync(nameof(IMultiplayerServer.AddPlaylistItem), item); 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<APIBeatmapSet> GetOnlineBeatmapSet(int beatmapId, CancellationToken cancellationToken = default) protected override Task<APIBeatmapSet> GetOnlineBeatmapSet(int beatmapId, CancellationToken cancellationToken = default)
{ {
var tcs = new TaskCompletionSource<APIBeatmapSet>(); var tcs = new TaskCompletionSource<APIBeatmapSet>();

10
osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
View File

@ -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<APIBeatmapSet> GetOnlineBeatmapSet(int beatmapId, CancellationToken cancellationToken = default) protected override Task<APIBeatmapSet> GetOnlineBeatmapSet(int beatmapId, CancellationToken cancellationToken = default)
{ {
Debug.Assert(Room != null); Debug.Assert(Room != null);