diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index decd04967f..9f03c381ee 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -125,30 +125,28 @@ namespace osu.Game.Rulesets.Scoring
/// Whether a increases the combo.
///
public static bool IncreasesCombo(this HitResult result)
+ => AffectsCombo(result) && IsHit(result);
+
+ ///
+ /// Whether a breaks the combo and resets it back to zero.
+ ///
+ public static bool BreaksCombo(this HitResult result)
+ => AffectsCombo(result) && !IsHit(result);
+
+ ///
+ /// Whether a increases/breaks the combo, and affects the combo portion of the score.
+ ///
+ public static bool AffectsCombo(this HitResult result)
{
switch (result)
{
+ case HitResult.Miss:
case HitResult.Meh:
case HitResult.Ok:
case HitResult.Good:
case HitResult.Great:
case HitResult.Perfect:
case HitResult.LargeTickHit:
- return true;
-
- default:
- return false;
- }
- }
-
- ///
- /// Whether a breaks the combo and resets it back to zero.
- ///
- public static bool BreaksCombo(this HitResult result)
- {
- switch (result)
- {
- case HitResult.Miss:
case HitResult.LargeTickMiss:
return true;
@@ -157,12 +155,6 @@ namespace osu.Game.Rulesets.Scoring
}
}
- ///
- /// Whether a increases/breaks the combo, and affects the combo portion of the score.
- ///
- public static bool AffectsCombo(this HitResult result)
- => IncreasesCombo(result) || BreaksCombo(result);
-
///
/// Whether a affects the accuracy portion of the score.
///