1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-18 20:22:58 +08:00

Merge branch 'master' into polygon-tool

This commit is contained in:
Dean Herbert 2024-08-19 13:53:30 +09:00
commit 7248c04ba4
No known key found for this signature in database
2 changed files with 7 additions and 2 deletions

View File

@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Osu.Edit
protected readonly OsuGridToolboxGroup OsuGridToolboxGroup = new OsuGridToolboxGroup();
[Cached]
protected readonly FreehandSliderToolboxGroup FreehandlSliderToolboxGroup = new FreehandSliderToolboxGroup();
protected readonly FreehandSliderToolboxGroup FreehandSliderToolboxGroup = new FreehandSliderToolboxGroup();
[BackgroundDependencyLoader]
private void load()
@ -111,7 +111,7 @@ namespace osu.Game.Rulesets.Osu.Edit
ScaleHandler = (OsuSelectionScaleHandler)BlueprintContainer.SelectionHandler.ScaleHandler,
},
new GenerateToolboxGroup(),
FreehandlSliderToolboxGroup
FreehandSliderToolboxGroup
}
);
}

View File

@ -208,6 +208,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
protected override async Task<MultiplayerRoom> JoinRoom(long roomId, string? password = null)
{
if (RoomJoined || ServerAPIRoom != null)
throw new InvalidOperationException("Already joined a room");
roomId = clone(roomId);
password = clone(password);
@ -260,6 +263,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
protected override Task LeaveRoomInternal()
{
RoomJoined = false;
ServerAPIRoom = null;
ServerRoom = null;
return Task.CompletedTask;
}