h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 09:27:34 +08:00
Code Issues Releases Wiki Activity

Also mutate multiplayer room playlist on callbacks

Browse Source
This commit is contained in:
Dan Balasescu 2021-11-19 16:35:42 +09:00
parent 12e1142b07
commit abb8b0de47
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -616,8 +616,9 @@ namespace osu.Game.Online.Multiplayer
Debug.Assert(APIRoom != null); Debug.Assert(APIRoom != null);
APIRoom.Playlist.RemoveAll(existing => existing.ID == playlistItem.ID); Room.Playlist.Add(item);
APIRoom.Playlist.Add(playlistItem); APIRoom.Playlist.Add(playlistItem);
RoomUpdated?.Invoke(); RoomUpdated?.Invoke();
}); });
} }
@ -634,7 +635,9 @@ namespace osu.Game.Online.Multiplayer
Debug.Assert(APIRoom != null); Debug.Assert(APIRoom != null);
Room.Playlist.Remove(Room.Playlist.Single(existing => existing.ID == playlistItemId));
APIRoom.Playlist.RemoveAll(existing => existing.ID == playlistItemId); APIRoom.Playlist.RemoveAll(existing => existing.ID == playlistItemId);
RoomUpdated?.Invoke(); RoomUpdated?.Invoke();
}); });
@ -655,17 +658,14 @@ namespace osu.Game.Online.Multiplayer
Debug.Assert(APIRoom != null); Debug.Assert(APIRoom != null);
PlaylistItem existingItem = APIRoom.Playlist.Single(existing => existing.ID == item.ID); Room.Playlist[Room.Playlist.IndexOf(Room.Playlist.First(existing => existing.ID == item.ID))] = item;
int existingIndex = APIRoom.Playlist.IndexOf(existingItem);
if (existingItem.Equals(playlistItem))
return;
// Replace the item. int existingIndex = APIRoom.Playlist.IndexOf(APIRoom.Playlist.Single(existing => existing.ID == item.ID));
APIRoom.Playlist.RemoveAt(existingIndex); APIRoom.Playlist.RemoveAt(existingIndex);
APIRoom.Playlist.Insert(existingIndex, playlistItem); APIRoom.Playlist.Insert(existingIndex, playlistItem);
// If the currently-selected item was the one that got replaced, update the selected item to the new one. // If the currently-selected item was the one that got replaced, update the selected item to the new one.
if (CurrentMatchPlayingItem.Value == existingItem) if (CurrentMatchPlayingItem.Value?.ID == playlistItem.ID)
CurrentMatchPlayingItem.Value = playlistItem; CurrentMatchPlayingItem.Value = playlistItem;
RoomUpdated?.Invoke(); RoomUpdated?.Invoke();