Apply suggested changes to fix implementation + tests

smoogipoo · Aug 30, 2024 · 81854e2 · 81854e2
1 parent 464378f
commit 81854e2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/osu.Game/Rulesets/Scoring/HealthProcessor.cs b/osu.Game/Rulesets/Scoring/HealthProcessor.cs
@@ -26,14 +26,14 @@ protected override void ApplyResultInternal(JudgementResult result)
 
             if (CheckDefaultFailCondition(result))
             {
-                bool allowFail = false;
+                bool allowFail = true;
 
                 for (int i = 0; i < Mods.Value.Count; i++)
                 {
                     if (Mods.Value[i] is IBlockFail blockMod)
                     {
                         // Intentionally does not early return so that all mods have a chance to update internal states (e.g. ModEasyWithExtraLives).
-                        allowFail |= blockMod.AllowFail();
+                        allowFail &= blockMod.AllowFail();
                         break;
                     }
                 }

diff --git a/osu.Game/Tests/Visual/ModForceFailTestScene.cs b/osu.Game/Tests/Visual/ModForceFailTestScene.cs
@@ -40,12 +40,12 @@ public ModFailConditionTestPlayer(ModTestData data, bool allowFail)
 
             protected override bool CheckModsAllowFailure() => true;
 
-            public bool CheckFailed(bool failed)
+            public bool CheckFailed(bool shouldHaveFailed)
             {
-                if (!failed)
+                if (!shouldHaveFailed)
                     return ScoreProcessor.HasCompleted.Value && !HealthProcessor.HasFailed;
 
-                return HealthProcessor.HasFailed;
+                return HealthProcessor.HasFailed || ScoreProcessor.HasFailed;
             }
         }