From 04c3a6f8a4c58672cca7b98085548e00197554ce Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 19 Dec 2019 20:18:17 +0900
Subject: [PATCH] Move more properties to the base class

---
 .../Rulesets/Scoring/JudgementProcessor.cs    | 20 ++++++++++++++++++
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs   | 21 -------------------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
index 854b926846..c7ac466eb0 100644
--- a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
@@ -11,6 +11,16 @@ namespace osu.Game.Rulesets.Scoring
 {
     public abstract class JudgementProcessor
     {
+        /// <summary>
+        /// Invoked when all <see cref="HitObject"/>s have been judged by this <see cref="JudgementProcessor"/>.
+        /// </summary>
+        public event Action AllJudged;
+
+        /// <summary>
+        /// Invoked when a new judgement has occurred. This occurs after the judgement has been processed by this <see cref="JudgementProcessor"/>.
+        /// </summary>
+        public event Action<JudgementResult> NewJudgement;
+
         /// <summary>
         /// The maximum number of hits that can be judged.
         /// </summary>
@@ -21,6 +31,11 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         public int JudgedHits { get; private set; }
 
+        /// <summary>
+        /// Whether all <see cref="Judgement"/>s have been processed.
+        /// </summary>
+        public bool HasCompleted => JudgedHits == MaxHits;
+
         protected JudgementProcessor(IBeatmap beatmap)
         {
             ApplyBeatmap(beatmap);
@@ -47,6 +62,11 @@ namespace osu.Game.Rulesets.Scoring
             JudgedHits++;
 
             ApplyResultInternal(result);
+
+            NewJudgement?.Invoke(result);
+
+            if (HasCompleted)
+                AllJudged?.Invoke();
         }
 
         /// <summary>
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 945c21e196..093ba16e57 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -10,7 +10,6 @@ using osu.Framework.Extensions;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Scoring;
 
 namespace osu.Game.Rulesets.Scoring
@@ -21,16 +20,6 @@ namespace osu.Game.Rulesets.Scoring
         private const double combo_portion = 0.7;
         private const double max_score = 1000000;
 
-        /// <summary>
-        /// Invoked when all <see cref="HitObject"/>s have been judged.
-        /// </summary>
-        public event Action AllJudged;
-
-        /// <summary>
-        /// Invoked when a new judgement has occurred. This occurs after the judgement has been processed by the <see cref="ScoreProcessor"/>.
-        /// </summary>
-        public event Action<JudgementResult> NewJudgement;
-
         /// <summary>
         /// The current total score.
         /// </summary>
@@ -66,11 +55,6 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         public readonly Bindable<ScoringMode> Mode = new Bindable<ScoringMode>();
 
-        /// <summary>
-        /// Whether all <see cref="Judgement"/>s have been processed.
-        /// </summary>
-        public bool HasCompleted => JudgedHits == MaxHits;
-
         private double maxHighestCombo;
 
         private double maxBaseScore;
@@ -158,11 +142,6 @@ namespace osu.Game.Rulesets.Scoring
             }
 
             updateScore();
-
-            NewJudgement?.Invoke(result);
-
-            if (HasCompleted)
-                AllJudged?.Invoke();
         }
 
         protected sealed override void RevertResultInternal(JudgementResult result)