From 16d893d40c10542a2502884df95d54773044ffb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 13 Feb 2024 12:26:37 +0100
Subject: [PATCH] Fix draining processor failing gameplay on bonus misses and
 ignore hits

---
 osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs | 5 +++++
 osu.Game/Rulesets/Scoring/HealthProcessor.cs         | 9 ++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
index 629a84ea62..92a064385b 100644
--- a/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs
@@ -142,6 +142,11 @@ namespace osu.Game.Rulesets.Scoring
             }
         }
 
+        protected override bool CanFailOn(JudgementResult result)
+        {
+            return !result.Judgement.MaxResult.IsBonus() && result.Type != HitResult.IgnoreHit;
+        }
+
         protected override void Reset(bool storeResults)
         {
             base.Reset(storeResults);
diff --git a/osu.Game/Rulesets/Scoring/HealthProcessor.cs b/osu.Game/Rulesets/Scoring/HealthProcessor.cs
index b5eb755650..ccf53f075a 100644
--- a/osu.Game/Rulesets/Scoring/HealthProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/HealthProcessor.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Scoring
 
             Health.Value += GetHealthIncreaseFor(result);
 
-            if (meetsAnyFailCondition(result))
+            if (CanFailOn(result) && meetsAnyFailCondition(result))
                 TriggerFailure();
         }
 
@@ -68,6 +68,13 @@ namespace osu.Game.Rulesets.Scoring
         /// <returns>The health increase.</returns>
         protected virtual double GetHealthIncreaseFor(JudgementResult result) => result.HealthIncrease;
 
+        /// <summary>
+        /// Whether a failure can occur on a given <paramref name="result"/>.
+        /// If the return value of this method is <see langword="false"/>, neither <see cref="DefaultFailCondition"/> nor <see cref="FailConditions"/> will be checked
+        /// after this <paramref name="result"/>.
+        /// </summary>
+        protected virtual bool CanFailOn(JudgementResult result) => true;
+
         /// <summary>
         /// The default conditions for failing.
         /// </summary>