From fb1cd9e5e7a9050a8b2af1882ecf342f4928baf8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Aug 2019 16:47:23 +0900
Subject: [PATCH] Add a sane default lifetime end for scrolling hitobjects

---
 .../UI/Scrolling/ScrollingHitObjectContainer.cs       | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 19247d8a37..14a4869a98 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -12,8 +12,13 @@ namespace osu.Game.Rulesets.UI.Scrolling
 {
     public class ScrollingHitObjectContainer : HitObjectContainer
     {
-        private readonly IBindable<double> timeRange = new BindableDouble();
+        /// <summary>
+        /// A multiplier applied to the length of the scrolling area to determine a safe default lifetime end for hitobjects.
+        /// This is only used to limit the lifetime end within reason, as proper lifetime management should be implemented on hitobjects themselves.
+        /// </summary>
+        private const float safe_lifetime_end_multiplier = 2;
 
+        private readonly IBindable<double> timeRange = new BindableDouble();
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
         [Resolved]
@@ -92,6 +97,8 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
             if (hitObject.HitObject is IHasEndTime endTime)
             {
+                hitObject.LifetimeEnd = scrollingInfo.Algorithm.TimeAt(scrollLength * safe_lifetime_end_multiplier, endTime.EndTime, timeRange.Value, scrollLength);
+
                 switch (direction.Value)
                 {
                     case ScrollingDirection.Up:
@@ -105,6 +112,8 @@ namespace osu.Game.Rulesets.UI.Scrolling
                         break;
                 }
             }
+            else
+                hitObject.LifetimeEnd = scrollingInfo.Algorithm.TimeAt(scrollLength * safe_lifetime_end_multiplier, hitObject.HitObject.StartTime, timeRange.Value, scrollLength);
 
             foreach (var obj in hitObject.NestedHitObjects)
             {