From aff275ea21784999ca29e37a695da2df430332a7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 5 Nov 2019 23:03:05 +0900
Subject: [PATCH] Revert "Fix follow point lifetime not being updated
correctly"
This reverts commit 1ef2b81041dfd9225ffb7e792b8c55bfa76d6ff1.
---
.../Drawables/Connections/FollowPointGroup.cs | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointGroup.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointGroup.cs
index c77ecd355f..9d651373ff 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointGroup.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointGroup.cs
@@ -121,15 +121,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
using (fp.BeginAbsoluteSequence(fadeInTime))
{
- // See: Expire calls are separated due to https://github.com/ppy/osu-framework/issues/2941
-
- fp.FadeIn(osuEnd.TimeFadeIn).Expire(true);
-
- fp.ScaleTo(osuEnd.Scale, osuEnd.TimeFadeIn, Easing.Out)
- .MoveTo(pointEndPosition, osuEnd.TimeFadeIn, Easing.Out)
- .Delay(fadeOutTime - fadeInTime).FadeOut(osuEnd.TimeFadeIn)
- .Expire();
+ fp.FadeIn(osuEnd.TimeFadeIn);
+ fp.ScaleTo(osuEnd.Scale, osuEnd.TimeFadeIn, Easing.Out);
+ fp.MoveTo(pointEndPosition, osuEnd.TimeFadeIn, Easing.Out);
+ fp.Delay(fadeOutTime - fadeInTime).FadeOut(osuEnd.TimeFadeIn);
}
+
+ fp.Expire(true);
}
}
}