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

Don't replace identical playlist items

Browse Source
This commit is contained in:
smoogipoo 2021-10-29 16:44:39 +09:00
parent f732c44265
commit 2408011c81
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game.Tests/Visual/Multiplayer/QueueingModes/TestSceneHostOnlyQueueingMode.cs
View File

@ -17,9 +17,19 @@ namespace osu.Game.Tests.Visual.Multiplayer.QueueingModes
protected override QueueModes Mode => QueueModes.HostOnly; protected override QueueModes Mode => QueueModes.HostOnly;
[Test] [Test]
public void TestItemStillSelectedAfterChange() public void TestItemStillSelectedAfterChangeToSameBeatmap()
{
selectNewItem(() => InitialBeatmap);
AddAssert("playlist item still selected", () => Client.CurrentMatchPlayingItem.Value == Client.APIRoom?.Playlist[0]);
}
[Test]
public void TestItemStillSelectedAfterChangeToOtherBeatmap()
{ {
selectNewItem(() => OtherBeatmap); selectNewItem(() => OtherBeatmap);
AddAssert("playlist item still selected", () => Client.CurrentMatchPlayingItem.Value == Client.APIRoom?.Playlist[0]);
} }
[Test] [Test]
@ -57,9 +67,11 @@ namespace osu.Game.Tests.Visual.Multiplayer.QueueingModes
AddUntilStep("wait for song select", () => CurrentSubScreen is Screens.Select.SongSelect select && select.IsLoaded); AddUntilStep("wait for song select", () => CurrentSubScreen is Screens.Select.SongSelect select && select.IsLoaded);
AddStep("select other beatmap", () => ((Screens.Select.SongSelect)CurrentSubScreen).FinaliseSelection(beatmap())); BeatmapInfo otherBeatmap = null;
AddStep("select other beatmap", () => ((Screens.Select.SongSelect)CurrentSubScreen).FinaliseSelection(otherBeatmap = beatmap()));
AddUntilStep("wait for return to match", () => CurrentSubScreen is MultiplayerMatchSubScreen); AddUntilStep("wait for return to match", () => CurrentSubScreen is MultiplayerMatchSubScreen);
AddUntilStep("selected item is new beatmap", () => Client.CurrentMatchPlayingItem.Value?.Beatmap.Value?.OnlineID == OtherBeatmap.OnlineID); AddUntilStep("selected item is new beatmap", () => Client.CurrentMatchPlayingItem.Value?.Beatmap.Value?.OnlineID == otherBeatmap.OnlineID);
} }
} }
} }

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

@ -623,11 +623,16 @@ namespace osu.Game.Online.Multiplayer
Debug.Assert(APIRoom != null); Debug.Assert(APIRoom != null);
int index = APIRoom.Playlist.Select((i, index) => (i, index)).Single(kvp => kvp.i.ID == item.ID).index; int index = APIRoom.Playlist.Select((i, index) => (i, index)).Single(kvp => kvp.i.ID == item.ID).index;
var oldItem = APIRoom.Playlist[index];
if (oldItem.Equals(playlistItem))
return;
// Replace the item.
APIRoom.Playlist.RemoveAt(index); APIRoom.Playlist.RemoveAt(index);
APIRoom.Playlist.Insert(index, playlistItem); APIRoom.Playlist.Insert(index, playlistItem);
// If the current item changed, update the selected playlist item. // If the currently-selected item was the one that got replaced, update the selected item to the new one.
if (item.ID == Room.Settings.PlaylistItemId) if (CurrentMatchPlayingItem.Value == oldItem)
CurrentMatchPlayingItem.Value = APIRoom.Playlist[index]; CurrentMatchPlayingItem.Value = APIRoom.Playlist[index];
}).ConfigureAwait(false); }).ConfigureAwait(false);
} }