diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlayer.cs
index 312281ac18..e05580fed6 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlayer.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
});
AddUntilStep("wait for player to be current", () => player.IsCurrentScreen() && player.IsLoaded);
- AddStep("start gameplay", () => ((IMultiplayerClient)MultiplayerClient).MatchStarted());
+ AddStep("start gameplay", () => ((IMultiplayerClient)MultiplayerClient).GameplayStarted());
}
[Test]
diff --git a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
index 3e6821b1cd..43ccfd36ed 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
@@ -98,9 +98,10 @@ namespace osu.Game.Online.Multiplayer
Task LoadRequested();
///
- /// Signals that a match has started. All users in the state should begin gameplay as soon as possible.
+ /// Signals that gameplay has started.
+ /// All users in the or states should begin gameplay as soon as possible.
///
- Task MatchStarted();
+ Task GameplayStarted();
///
/// Signals that the match has ended, all players have finished and results are ready to be displayed.
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 967220abbf..a9fdf1110f 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Online.Multiplayer
///
/// Invoked when the multiplayer server requests gameplay to be started.
///
- public event Action? MatchStarted;
+ public event Action? GameplayStarted;
///
/// Invoked when the multiplayer server has finished collating results.
@@ -604,14 +604,14 @@ namespace osu.Game.Online.Multiplayer
return Task.CompletedTask;
}
- Task IMultiplayerClient.MatchStarted()
+ Task IMultiplayerClient.GameplayStarted()
{
Scheduler.Add(() =>
{
if (Room == null)
return;
- MatchStarted?.Invoke();
+ GameplayStarted?.Invoke();
}, false);
return Task.CompletedTask;
diff --git a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
index 7e62908ecd..de93233830 100644
--- a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Online.Multiplayer
connection.On(nameof(IMultiplayerClient.SettingsChanged), ((IMultiplayerClient)this).SettingsChanged);
connection.On(nameof(IMultiplayerClient.UserStateChanged), ((IMultiplayerClient)this).UserStateChanged);
connection.On(nameof(IMultiplayerClient.LoadRequested), ((IMultiplayerClient)this).LoadRequested);
- connection.On(nameof(IMultiplayerClient.MatchStarted), ((IMultiplayerClient)this).MatchStarted);
+ connection.On(nameof(IMultiplayerClient.GameplayStarted), ((IMultiplayerClient)this).GameplayStarted);
connection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);
connection.On>(nameof(IMultiplayerClient.UserModsChanged), ((IMultiplayerClient)this).UserModsChanged);
connection.On(nameof(IMultiplayerClient.UserBeatmapAvailabilityChanged), ((IMultiplayerClient)this).UserBeatmapAvailabilityChanged);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index 70f8f1b752..d3a78a43a5 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -115,7 +115,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
if (!ValidForResume)
return; // token retrieval may have failed.
- client.MatchStarted += onMatchStarted;
+ client.GameplayStarted += onGameplayStarted;
client.ResultsReady += onResultsReady;
ScoreProcessor.HasCompleted.BindValueChanged(completed =>
@@ -175,7 +175,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
leaderboardFlow.Position = new Vector2(padding, padding + HUDOverlay.TopScoringElementsHeight);
}
- private void onMatchStarted() => Scheduler.Add(() =>
+ private void onGameplayStarted() => Scheduler.Add(() =>
{
if (!this.IsCurrentScreen())
return;
@@ -223,7 +223,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
if (client != null)
{
- client.MatchStarted -= onMatchStarted;
+ client.GameplayStarted -= onGameplayStarted;
client.ResultsReady -= onResultsReady;
}
}
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 21774b73a0..725499d0e5 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -155,7 +155,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
foreach (var u in Room.Users.Where(u => u.State == MultiplayerUserState.Loaded))
ChangeUserState(u.UserID, MultiplayerUserState.Playing);
- ((IMultiplayerClient)this).MatchStarted();
+ ((IMultiplayerClient)this).GameplayStarted();
ChangeRoomState(MultiplayerRoomState.Playing);
}