Skip to content

Fix automatic intro skip not triggering in multiplayer #38232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
intkr wants to merge 5 commits into
base: master
Choose a base branch
from
+36 −1
Draft

Fix automatic intro skip not triggering in multiplayer #38232

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
05018c9
Fix intro not skipping in multiplayer
intkr Jul 7, 2026
79f7f98
Call overridden method instead of base
intkr Jul 10, 2026
fffe514
Add inline explanation
intkr Jul 10, 2026
c8841da
Split setup function into two
intkr Jul 10, 2026
3311286
Add failing test coverage
intkr Jul 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,11 @@ private void onGameplayStarted() => Scheduler.Add(() =>

loadingDisplay.Hide();
base.StartGameplay();

if (Configuration.AutomaticallySkipIntro)
{
base.RequestIntroSkip();
Comment thread
intkr marked this conversation as resolved.
Outdated
}
});

private void onResultsReady()
Expand Down Expand Up @@ -225,15 +230,11 @@ protected override async Task PrepareScoreForResultsAsync(Score score)

protected override void RequestIntroSkip()
{
// If the room is set up such that the intro is automatically skipped, there's no need to vote on it.
if (Configuration.AutomaticallySkipIntro)
if (!Configuration.AutomaticallySkipIntro)
{
base.RequestIntroSkip();
return;
// No base call because we aren't skipping yet.
client.VoteToSkipIntro().FireAndForget();
}

// No base call because we aren't skipping yet.
client.VoteToSkipIntro().FireAndForget();
}

private void onVoteToSkipIntroPassed()
Expand Down
Loading