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

Update comments

Browse Source
This commit is contained in:
smoogipoo 2021-02-17 17:58:24 +09:00
parent 0d1149911c
commit 70a995919c
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
View File

@ -36,9 +36,6 @@ namespace osu.Game.Online.Multiplayer
[Key(5)] [Key(5)]
public IEnumerable<APIMod> AllowedMods { get; set; } = Enumerable.Empty<APIMod>(); public IEnumerable<APIMod> AllowedMods { get; set; } = Enumerable.Empty<APIMod>();
/// <summary>
/// Only used for client-side mutation.
/// </summary>
[Key(6)] [Key(6)]
public long PlaylistItemId { get; set; } public long PlaylistItemId { get; set; }

4
osu.Game/Online/Rooms/Room.cs
View File

@ -149,8 +149,8 @@ namespace osu.Game.Online.Rooms
Status.Value = new RoomStatusEnded(); Status.Value = new RoomStatusEnded();
// Todo: This is not the best way/place to do this, but the intention is to display all playlist items when the room has ended, // Todo: This is not the best way/place to do this, but the intention is to display all playlist items when the room has ended,
// and display only the non-expired playlist items while the room is still active. // and display only the non-expired playlist items while the room is still active. In order to achieve this, all expired items are removed from the source Room.
// In order to achieve this, all expired items are removed from the source Room. // More refactoring is required before this can be done locally instead - DrawableRoomPlaylist is currently directly bound to the playlist to display items in the room.
if (!(Status.Value is RoomStatusEnded)) if (!(Status.Value is RoomStatusEnded))
other.Playlist.RemoveAll(i => i.Expired); other.Playlist.RemoveAll(i => i.Expired);

2
osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
View File

@ -77,6 +77,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
private void updateBeatmap() private void updateBeatmap()
{ {
Debug.Assert(SelectedItem != null); Debug.Assert(SelectedItem != null);
// When the selected item is null, the match hasn't yet been created. Use the playlist directly, which is mutated by song selection.
PlaylistItem item = SelectedItem.Value ?? Playlist.FirstOrDefault(); PlaylistItem item = SelectedItem.Value ?? Playlist.FirstOrDefault();
if (item == null) if (item == null)