h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 21:03:08 +08:00
Code Issues Releases Wiki Activity

Fix post-merge errors

Browse Source
This commit is contained in:
smoogipoo 2021-04-21 17:13:01 +09:00
parent e78ef05fcf
commit f32d00c0d9
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
View File

@ -86,7 +86,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
base.LoadComplete(); base.LoadComplete();
masterClockContainer.Stop(); masterClockContainer.Stop();
masterClockContainer.Restart(); masterClockContainer.Reset();
} }
protected override void OnUserStateChanged(int userId, SpectatorState spectatorState) protected override void OnUserStateChanged(int userId, SpectatorState spectatorState)

6
osu.Game/Screens/Play/GameplayClockContainer.cs
View File

@ -154,11 +154,7 @@ namespace osu.Game.Screens.Play
return true; return true;
} }
void IAdjustableClock.Reset() void IAdjustableClock.Reset() => Reset();
{
Restart();
Stop();
}
public void ResetSpeedAdjustments() public void ResetSpeedAdjustments()
{ {