From 876b80642357996f90e8469cc25eb1e490f1f224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 29 Feb 2024 12:11:50 +0100
Subject: [PATCH] Store tracking history to slider judgement result instead

---
 .../Judgements/OsuSliderJudgementResult.cs    | 20 +++++++++++++++++++
 .../Objects/Drawables/DrawableSlider.cs       |  6 ++++++
 .../Objects/Drawables/SliderInputManager.cs   |  7 ++-----
 3 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Judgements/OsuSliderJudgementResult.cs

diff --git a/osu.Game.Rulesets.Osu/Judgements/OsuSliderJudgementResult.cs b/osu.Game.Rulesets.Osu/Judgements/OsuSliderJudgementResult.cs
new file mode 100644
index 0000000000..f52294cdd7
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Judgements/OsuSliderJudgementResult.cs
@@ -0,0 +1,20 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Rulesets.Osu.Judgements
+{
+    public class OsuSliderJudgementResult : OsuJudgementResult
+    {
+        public readonly Stack<(double time, bool tracking)> TrackingHistory = new Stack<(double, bool)>();
+
+        public OsuSliderJudgementResult(HitObject hitObject, Judgement judgement)
+            : base(hitObject, judgement)
+        {
+            TrackingHistory.Push((double.NegativeInfinity, false));
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index b7ce712e2c..e519e51562 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -14,8 +14,10 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Layout;
 using osu.Game.Audio;
 using osu.Game.Graphics.Containers;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
@@ -27,6 +29,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
     {
         public new Slider HitObject => (Slider)base.HitObject;
 
+        public new OsuSliderJudgementResult Result => (OsuSliderJudgementResult)base.Result;
+
         public DrawableSliderHead HeadCircle => headContainer.Child;
         public DrawableSliderTail TailCircle => tailContainer.Child;
 
@@ -134,6 +138,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }, true);
         }
 
+        protected override JudgementResult CreateResult(Judgement judgement) => new OsuSliderJudgementResult(HitObject, judgement);
+
         protected override void OnApply()
         {
             base.OnApply();
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs
index 5daf8ed972..c75ae35a1a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/SliderInputManager.cs
@@ -27,8 +27,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         [Resolved]
         private IGameplayClock? gameplayClock { get; set; }
 
-        private readonly Stack<(double time, bool tracking)> trackingHistory = new Stack<(double, bool)>();
-
         /// <summary>
         /// The point in time after which we can accept any key for tracking. Before this time, we may need to restrict tracking to the key used to hit the head circle.
         ///
@@ -219,6 +217,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             if (gameplayClock?.IsRewinding == true)
             {
+                var trackingHistory = slider.Result.TrackingHistory;
                 while (trackingHistory.TryPeek(out var historyEntry) && Time.Current < historyEntry.time)
                     trackingHistory.Pop();
 
@@ -271,7 +270,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 && validTrackingAction;
 
             if (wasTracking != Tracking)
-                trackingHistory.Push((Time.Current, Tracking));
+                slider.Result.TrackingHistory.Push((Time.Current, Tracking));
         }
 
         private OsuAction? getInitialHitAction() => slider.HeadCircle?.HitAction;
@@ -293,8 +292,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private void resetState(DrawableHitObject obj)
         {
             Tracking = false;
-            trackingHistory.Clear();
-            trackingHistory.Push((double.NegativeInfinity, false));
             timeToAcceptAnyKeyAfter = null;
             lastPressedActions.Clear();
             screenSpaceMousePosition = null;