From 31f64b13819620d1eee947e84dae43220b371081 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 26 Apr 2022 22:49:14 +0300
Subject: [PATCH] Fix `HealthProcessor` fail conditions not handling multiple
 invocations

---
 osu.Game/Rulesets/Scoring/HealthProcessor.cs | 32 +++++++++++++++++---
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/HealthProcessor.cs b/osu.Game/Rulesets/Scoring/HealthProcessor.cs
index a92c30e593..5e4e40b3bb 100644
--- a/osu.Game/Rulesets/Scoring/HealthProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/HealthProcessor.cs
@@ -43,11 +43,11 @@ namespace osu.Game.Rulesets.Scoring
 
             Health.Value += GetHealthIncreaseFor(result);
 
-            if (!DefaultFailCondition && FailConditions?.Invoke(this, result) != true)
-                return;
-
-            if (Failed?.Invoke() != false)
-                HasFailed = true;
+            if (meetsFailConditions(result))
+            {
+                if (Failed?.Invoke() != false)
+                    HasFailed = true;
+            }
         }
 
         protected override void RevertResultInternal(JudgementResult result)
@@ -69,6 +69,28 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         protected virtual bool DefaultFailCondition => Precision.AlmostBigger(Health.MinValue, Health.Value);
 
+        /// <summary>
+        /// Whether the current state of <see cref="HealthProcessor"/> or the provided <paramref name="result"/> meets the fail conditions.
+        /// </summary>
+        /// <param name="result">The judgement result.</param>
+        private bool meetsFailConditions(JudgementResult result)
+        {
+            if (DefaultFailCondition)
+                return true;
+
+            if (FailConditions != null)
+            {
+                foreach (var condition in FailConditions.GetInvocationList())
+                {
+                    bool conditionResult = (bool)condition.Method.Invoke(condition.Target, new object[] { this, result });
+                    if (conditionResult)
+                        return true;
+                }
+            }
+
+            return false;
+        }
+
         protected override void Reset(bool storeResults)
         {
             base.Reset(storeResults);