From 43879633db8810209ffeab2ed1f7d8f9f36a06ad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Aug 2022 18:28:55 +0900
Subject: [PATCH] Ensure setting a `StartTime` on a `GameplayClockContainer`
 always resets to the new time

---
 .../Gameplay/TestSceneStoryboardSamples.cs          |  3 +++
 osu.Game/Screens/Play/GameplayClockContainer.cs     | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 18ae2cb7c8..afdcedb485 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -90,6 +90,9 @@ namespace osu.Game.Tests.Gameplay
             AddUntilStep("sample has lifetime end", () => sample.LifetimeEnd < double.MaxValue);
         }
 
+        /// <summary>
+        /// Sample at 0ms, start time at 1000ms (so the sample should not be played).
+        /// </summary>
         [Test]
         public void TestSampleHasLifetimeEndWithInitialClockTime()
         {
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 33f4f26dfb..ae9779434d 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -38,12 +38,23 @@ namespace osu.Game.Screens.Play
 
         /// <summary>
         /// The time from which the clock should start. Will be seeked to on calling <see cref="Reset"/>.
+        /// Settting a start time will <see cref="Reset"/> to the new value.
         /// </summary>
         /// <remarks>
         /// By default, a value of zero will be used.
         /// Importantly, the value will be inferred from the current beatmap in <see cref="MasterGameplayClockContainer"/> by default.
         /// </remarks>
-        public double StartTime { get; set; } = 0;
+        public double StartTime
+        {
+            get => startTime;
+            set
+            {
+                startTime = value;
+                Reset();
+            }
+        }
+
+        private double startTime;
 
         public virtual IEnumerable<double> NonGameplayAdjustments => Enumerable.Empty<double>();