From 566d874641922a3b680b648542aecc7702a0236b Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Thu, 8 Aug 2019 15:25:07 +0300
Subject: [PATCH] Prevent failing when reverting to a hasFailedAtJudgement

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index fd851f2cbb..5ca33ff0bc 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Rulesets.Scoring
         /// <summary>
         /// Whether this ScoreProcessor has already triggered the failed state.
         /// </summary>
-        public virtual bool HasFailed { get; private set; }
+        public virtual bool HasFailed { get; protected set; }
 
         /// <summary>
         /// The default conditions for failing.
@@ -309,6 +309,7 @@ namespace osu.Game.Rulesets.Scoring
         }
 
         private readonly Dictionary<HitResult, int> scoreResultCounts = new Dictionary<HitResult, int>();
+        private Judgement hasFailedAtJudgement;
 
         /// <summary>
         /// Applies the score change of a <see cref="JudgementResult"/> to this <see cref="ScoreProcessor"/>.
@@ -317,7 +318,12 @@ namespace osu.Game.Rulesets.Scoring
         protected virtual void ApplyResult(JudgementResult result)
         {
             if (HasFailed)
+            {
+                if (hasFailedAtJudgement == null)
+                    hasFailedAtJudgement = result.Judgement;
+
                 return;
+            }
 
             result.ComboAtJudgement = Combo.Value;
             result.HighestComboAtJudgement = HighestCombo.Value;
@@ -365,6 +371,17 @@ namespace osu.Game.Rulesets.Scoring
         /// <param name="result">The judgement scoring result.</param>
         protected virtual void RevertResult(JudgementResult result)
         {
+            if (HasFailed)
+            {
+                if (hasFailedAtJudgement == result.Judgement)
+                {
+                    hasFailedAtJudgement = null;
+                    HasFailed = false;
+                }
+
+                return;
+            }
+
             Combo.Value = result.ComboAtJudgement;
             HighestCombo.Value = result.HighestComboAtJudgement;
             Health.Value = result.HealthAtJudgement;