Hotfix approach circle cutoff

Hotfix multiplayer crashes
2026-05-13 21:53:29 +08:00 · 2023-10-09 04:02:02 +09:00 · 2023-10-09 03:58:31 +09:00
4 changed files with 6 additions and 3 deletions
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
        private DrawableHitObject drawableObject { get; set; } = null!;

        public LegacyApproachCircle()
-            : base("Gameplay/osu/approachcircle", OsuHitObject.OBJECT_DIMENSIONS)
+            : base("Gameplay/osu/approachcircle", OsuHitObject.OBJECT_DIMENSIONS * 2)
        {
        }

@@ -148,6 +148,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                loadingDisplay.Show();
                client.ChangeState(MultiplayerUserState.ReadyForGameplay);
            }
+
+            GameplayClockContainer.Reset();
        }

        private void failAndBail(string message = null)
@@ -143,7 +143,8 @@ namespace osu.Game.Screens.Play
        {
            bool wasPaused = isPaused.Value;

-            Stop();
+            // Forcefully stop, ignoring isPaused.
+            StopGameplayClock();

            if (time != null)
                StartTime = time.Value;
@@ -1078,7 +1078,7 @@ namespace osu.Game.Screens.Play
        protected virtual void StartGameplay()
        {
            if (GameplayClockContainer.IsRunning)
-                throw new InvalidOperationException($"{nameof(StartGameplay)} should not be called when the gameplay clock is already running");
+                Logger.Error(new InvalidOperationException($"{nameof(StartGameplay)} should not be called when the gameplay clock is already running"), "Clock failure");

            GameplayClockContainer.Reset(startClock: true);