sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 15:16:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16075 from smoogipoo/prevent-idle-transition-during-load

Browse Source 
Add AbortGameplay() to fix state transition race conditions during multiplayer load
This commit is contained in:
Dean Herbert
2021-12-15 19:59:19 +09:00
committed by GitHub
parent 2025183f5a 9ade8069a1
commit 33cf4ba7f6
5 changed files with 61 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
View File

@ -77,6 +77,11 @@ namespace osu.Game.Online.Multiplayer
/// <exception cref="InvalidStateException">If an attempt to start the game occurs when the game's (or users') state disallows it.</exception>
Task StartMatch();
/// <summary>
/// Aborts an ongoing gameplay load.
/// </summary>
Task AbortGameplay();
/// <summary>
/// Adds an item to the playlist.
/// </summary>

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

@ -327,6 +327,8 @@ namespace osu.Game.Online.Multiplayer
public abstract Task StartMatch();
public abstract Task AbortGameplay();
public abstract Task AddPlaylistItem(MultiplayerPlaylistItem item);
public abstract Task EditPlaylistItem(MultiplayerPlaylistItem item);

8
osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
View File

@ -154,6 +154,14 @@ namespace osu.Game.Online.Multiplayer
return connection.InvokeAsync(nameof(IMultiplayerServer.StartMatch));
}
public override Task AbortGameplay()
{
if (!IsConnected.Value)
return Task.CompletedTask;
return connection.InvokeAsync(nameof(IMultiplayerServer.AbortGameplay));
}
public override Task AddPlaylistItem(MultiplayerPlaylistItem item)
{
if (!IsConnected.Value)