From 5aa522b1c28cb500ac1985595234b8cd0acacb69 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 28 Apr 2021 20:23:52 +0900
Subject: [PATCH] Completely delegate DHO lifetime to Entry lifetime

A downside is lifetime update is not caught by LifetimeManagementContainer if used.
---
 .../Gameplay/TestSceneDrawableHitObject.cs    | 13 ++++----
 .../Pooling/PoolableDrawableWithLifetime.cs   | 32 ++++++-------------
 2 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs b/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
index 2e3f192f1b..0bec02c488 100644
--- a/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
@@ -45,15 +45,16 @@ namespace osu.Game.Tests.Gameplay
             AddStep("Create DHO", () =>
             {
                 dho = new TestDrawableHitObject(null);
-                dho.Apply(entry = new TestLifetimeEntry(new HitObject())
-                {
-                    LifetimeStart = 0,
-                    LifetimeEnd = 1000,
-                });
+                dho.Apply(entry = new TestLifetimeEntry(new HitObject()));
                 Child = dho;
             });
 
-            AddStep("KeepAlive = true", () => entry.KeepAlive = true);
+            AddStep("KeepAlive = true", () =>
+            {
+                entry.LifetimeStart = 0;
+                entry.LifetimeEnd = 1000;
+                entry.KeepAlive = true;
+            });
             AddAssert("Lifetime is overriden", () => entry.LifetimeStart == double.MinValue && entry.LifetimeEnd == double.MaxValue);
 
             AddStep("Set LifetimeStart", () => dho.LifetimeStart = 500);
diff --git a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
index 31f1768044..e94b6dca9d 100644
--- a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
@@ -28,14 +28,20 @@ namespace osu.Game.Rulesets.Objects.Pooling
 
         public override double LifetimeStart
         {
-            get => base.LifetimeStart;
-            set => setLifetime(value, LifetimeEnd);
+            get => Entry?.LifetimeStart ?? double.MinValue;
+            set
+            {
+                if (Entry != null) Entry.LifetimeStart = value;
+            }
         }
 
         public override double LifetimeEnd
         {
-            get => base.LifetimeEnd;
-            set => setLifetime(LifetimeStart, value);
+            get => Entry?.LifetimeEnd ?? double.MaxValue;
+            set
+            {
+                if (Entry != null) Entry.LifetimeEnd = value;
+            }
         }
 
         public override bool RemoveWhenNotAlive => false;
@@ -64,11 +70,8 @@ namespace osu.Game.Rulesets.Objects.Pooling
             if (HasEntryApplied)
                 free();
 
-            setLifetime(entry.LifetimeStart, entry.LifetimeEnd);
             Entry = entry;
-
             OnApply(entry);
-
             HasEntryApplied = true;
         }
 
@@ -95,27 +98,12 @@ namespace osu.Game.Rulesets.Objects.Pooling
         {
         }
 
-        private void setLifetime(double start, double end)
-        {
-            base.LifetimeStart = start;
-            base.LifetimeEnd = end;
-
-            if (Entry != null)
-            {
-                Entry.LifetimeStart = start;
-                Entry.LifetimeEnd = end;
-            }
-        }
-
         private void free()
         {
             Debug.Assert(Entry != null && HasEntryApplied);
 
             OnFree(Entry);
-
             Entry = null;
-            setLifetime(double.MaxValue, double.MaxValue);
-
             HasEntryApplied = false;
         }
     }