From a25be9927df56d845f1a95f8a74bd535c9273fa0 Mon Sep 17 00:00:00 2001 From: Salman Ahmed Date: Sat, 27 Jan 2024 19:12:03 +0300 Subject: [PATCH] Fix score processor no longer applying results when failing in multiplayer match --- osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 6 ------ osu.Game/Screens/Play/Player.cs | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs index a092829317..7d50dd4665 100644 --- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs +++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs @@ -211,9 +211,6 @@ namespace osu.Game.Rulesets.Scoring result.ComboAtJudgement = Combo.Value; result.HighestComboAtJudgement = HighestCombo.Value; - if (result.FailedAtJudgement) - return; - ScoreResultCounts[result.Type] = ScoreResultCounts.GetValueOrDefault(result.Type) + 1; if (result.Type.IncreasesCombo()) @@ -267,9 +264,6 @@ namespace osu.Game.Rulesets.Scoring Combo.Value = result.ComboAtJudgement; HighestCombo.Value = result.HighestComboAtJudgement; - if (result.FailedAtJudgement) - return; - ScoreResultCounts[result.Type] = ScoreResultCounts.GetValueOrDefault(result.Type) - 1; if (result.Judgement.MaxResult.AffectsAccuracy()) diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs index ff1deecc3d..e2470285ba 100644 --- a/osu.Game/Screens/Play/Player.cs +++ b/osu.Game/Screens/Play/Player.cs @@ -357,6 +357,9 @@ namespace osu.Game.Screens.Play DrawableRuleset.NewResult += r => { + if (GameplayState.ShownFailAnimation) + return; + HealthProcessor.ApplyResult(r); ScoreProcessor.ApplyResult(r); GameplayState.ApplyResult(r); @@ -364,6 +367,9 @@ namespace osu.Game.Screens.Play DrawableRuleset.RevertResult += r => { + if (GameplayState.ShownFailAnimation) + return; + HealthProcessor.RevertResult(r); ScoreProcessor.RevertResult(r); };