h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 20:45:46 +08:00
Code Issues Releases Wiki Activity

Merge pull request #15784 from smoogipoo/fix-mp-resuming

Browse Source 
Fix multiplayer starting with own latest picked playlist item rather than the current playlist item
This commit is contained in:
Bartłomiej Dach 2021-11-24 20:45:44 +01:00 committed by GitHub
commit 53dea8c606
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game.Tests/Visual/Multiplayer/TestSceneAllPlayersQueueMode.cs
View File

@ -78,6 +78,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
AddAssert("playlist item is not expired", () => Client.APIRoom?.Playlist[1].Expired == false); AddAssert("playlist item is not expired", () => Client.APIRoom?.Playlist[1].Expired == false);
} }
[Test]
public void TestCorrectItemSelectedAfterNewItemAdded()
{
addItem(() => OtherBeatmap);
AddAssert("selected beatmap is initial beatmap", () => Beatmap.Value.BeatmapInfo.OnlineID == InitialBeatmap.OnlineID);
}
private void addItem(Func<BeatmapInfo> beatmap) private void addItem(Func<BeatmapInfo> beatmap)
{ {
AddStep("click edit button", () => AddStep("click edit button", () =>

1
osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
View File

@ -302,6 +302,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
public override void OnResuming(IScreen last) public override void OnResuming(IScreen last)
{ {
base.OnResuming(last); base.OnResuming(last);
updateWorkingBeatmap();
beginHandlingTrack(); beginHandlingTrack();
Scheduler.AddOnce(UpdateMods); Scheduler.AddOnce(UpdateMods);
} }