From 57a6025a2c492c897531cbb56ae0bdaf136dd03c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Jan 2024 15:52:05 +0900
Subject: [PATCH 1/2] Add helper method to bypass judgement woes

---
 osu.Game/Rulesets/Judgements/JudgementResult.cs | 5 +++++
 osu.Game/Rulesets/Scoring/HealthProcessor.cs    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Judgements/JudgementResult.cs b/osu.Game/Rulesets/Judgements/JudgementResult.cs
index 1b915d52b7..b781a13929 100644
--- a/osu.Game/Rulesets/Judgements/JudgementResult.cs
+++ b/osu.Game/Rulesets/Judgements/JudgementResult.cs
@@ -94,6 +94,11 @@ namespace osu.Game.Rulesets.Judgements
         /// </summary>
         public bool IsHit => Type.IsHit();
 
+        /// <summary>
+        /// The increase in health resulting from this judgement result.
+        /// </summary>
+        public double HealthIncrease => Judgement.HealthIncreaseFor(this);
+
         /// <summary>
         /// Creates a new <see cref="JudgementResult"/>.
         /// </summary>
diff --git a/osu.Game/Rulesets/Scoring/HealthProcessor.cs b/osu.Game/Rulesets/Scoring/HealthProcessor.cs
index 3e0b6433c2..b5eb755650 100644
--- a/osu.Game/Rulesets/Scoring/HealthProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/HealthProcessor.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         /// <param name="result">The <see cref="JudgementResult"/>.</param>
         /// <returns>The health increase.</returns>
-        protected virtual double GetHealthIncreaseFor(JudgementResult result) => result.Judgement.HealthIncreaseFor(result);
+        protected virtual double GetHealthIncreaseFor(JudgementResult result) => result.HealthIncrease;
 
         /// <summary>
         /// The default conditions for failing.

From 2be8d66d4c75cee98d9aa0e5b60c99f475bb555c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Jan 2024 15:52:18 +0900
Subject: [PATCH 2/2] Fix argon health bar showing "miss" bar for bananas

---
 osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
index 6fc957874a..71996718d9 100644
--- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
@@ -136,7 +136,12 @@ namespace osu.Game.Screens.Play.HUD
             BarHeight.BindValueChanged(_ => updateContentSize(), true);
         }
 
-        private void onNewJudgement(JudgementResult result) => pendingMissAnimation |= !result.IsHit;
+        private void onNewJudgement(JudgementResult result)
+        {
+            // Check the health increase because cases like osu!catch bananas fire `IgnoreMiss`,
+            // which counts as a miss but doesn't actually subtract any health.
+            pendingMissAnimation |= !result.IsHit && result.HealthIncrease < 0;
+        }
 
         protected override void Update()
         {