From 2418f17b0cd11ea01bf59a1fba1eae70e81f4ee0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 20 Nov 2020 16:19:02 +0900
Subject: [PATCH] Fix lifetime not being set correctly in some cases

---
 .../Objects/Drawables/Connections/FollowPointConnection.cs     | 3 ---
 .../Objects/Drawables/Connections/FollowPointRenderer.cs       | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
index fe35cd02dc..3f6854786b 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
@@ -53,9 +53,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
 
             double startTime = start.GetEndTime();
 
-            if (end == null || end.NewCombo || start is Spinner || end is Spinner)
-                return;
-
             Vector2 startPosition = start.StackedEndPosition;
             Vector2 endPosition = end.StackedPosition;
             double endTime = end.StartTime;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
index 6dea16d01f..7067cf2728 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
@@ -239,7 +239,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
 
             private void refreshLifetimes()
             {
-                if (end == null)
+                if (End == null || End.NewCombo || Start is Spinner || End is Spinner)
                 {
                     LifetimeEnd = LifetimeStart;
                     return;