h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-06-05 01:04:16 +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
Unverified
parent e78ef05fcf
commit f32d00c0d9
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+1 -1
View File
@@ -86,7 +86,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
base.LoadComplete();
masterClockContainer.Stop();
masterClockContainer.Restart();
masterClockContainer.Reset();
}
protected override void OnUserStateChanged(int userId, SpectatorState spectatorState)
osu.Game/Screens/Play/GameplayClockContainer.cs
+1 -5
View File
@@ -154,11 +154,7 @@ namespace osu.Game.Screens.Play
return true;
}
void IAdjustableClock.Reset()
{
Restart();
Stop();
}
void IAdjustableClock.Reset() => Reset();
public void ResetSpeedAdjustments()
{