1
0
mirror of https://github.com/ppy/osu.git synced 2026-05-25 23:30:51 +08:00

Merge pull request #35022 from smoogipoo/matchmaking-fix-errors

Fix errors in gameplay stage of matchmaking
This commit is contained in:
Dean Herbert
2025-09-15 22:25:58 +09:00
committed by GitHub
Unverified
@@ -217,6 +217,10 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking
private void updateGameplayState()
{
MultiplayerPlaylistItem item = client.Room!.CurrentPlaylistItem;
if (item.Expired)
return;
RulesetInfo ruleset = rulesets.GetRuleset(item.RulesetID)!;
Ruleset rulesetInstance = ruleset.CreateInstance();
@@ -228,9 +232,15 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking
Mods.Value = item.RequiredMods.Select(m => m.ToMod(rulesetInstance)).ToArray();
if (Beatmap.Value is DummyWorkingBeatmap)
client.ChangeState(MultiplayerUserState.Idle).FireAndForget();
{
if (client.LocalUser!.State == MultiplayerUserState.Ready)
client.ChangeState(MultiplayerUserState.Idle).FireAndForget();
}
else
client.ChangeState(MultiplayerUserState.Ready).FireAndForget();
{
if (client.LocalUser!.State == MultiplayerUserState.Idle)
client.ChangeState(MultiplayerUserState.Ready).FireAndForget();
}
client.ChangeBeatmapAvailability(beatmapAvailabilityTracker.Availability.Value).FireAndForget();
}