Merge pull request ppy#30862 from frenzibyte/dont-scare-the-player

Don't play fail animation if restarting on fail
peppy · Nov 24, 2024 · c34827a · c34827a
2 parents 888f02e + 6d0d7f3
commit c34827a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
@@ -976,7 +976,9 @@ private bool onFail()
                 if (PauseOverlay.State.Value == Visibility.Visible)
                     PauseOverlay.Hide();
 
-                failAnimationContainer.Start();
+                bool restartOnFail = GameplayState.Mods.OfType<IApplicableFailOverride>().Any(m => m.RestartOnFail);
+                if (!restartOnFail)
+                    failAnimationContainer.Start();
 
                 // Failures can be triggered either by a judgement, or by a mod.
                 //
@@ -990,7 +992,7 @@ private bool onFail()
                     ScoreProcessor.FailScore(Score.ScoreInfo);
                     OnFail();
 
-                    if (GameplayState.Mods.OfType<IApplicableFailOverride>().Any(m => m.RestartOnFail))
+                    if (restartOnFail)
                         Restart(true);
                 });
             }