sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 16:59:53 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix setting lifetime during KeepAlive is ignored

Browse Source
This commit is contained in:
ekrctb
2021-05-04 16:56:48 +09:00
parent 4a93e27e83
commit aa42cf2fc0
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
View File

@ -32,12 +32,11 @@ namespace osu.Game.Rulesets.Objects.Pooling
get => Entry?.LifetimeStart ?? double.MinValue; get => Entry?.LifetimeStart ?? double.MinValue;
set set
{ {
if (LifetimeStart == value) return; if (Entry == null && LifetimeStart != value)
if (Entry == null)
throw new InvalidOperationException($"Cannot modify lifetime of {nameof(PoolableDrawableWithLifetime<TEntry>)} when entry is not set"); throw new InvalidOperationException($"Cannot modify lifetime of {nameof(PoolableDrawableWithLifetime<TEntry>)} when entry is not set");
Entry.LifetimeStart = value; if (Entry != null)
Entry.LifetimeStart = value;
} }
} }
@ -46,12 +45,11 @@ namespace osu.Game.Rulesets.Objects.Pooling
get => Entry?.LifetimeEnd ?? double.MaxValue; get => Entry?.LifetimeEnd ?? double.MaxValue;
set set
{ {
if (LifetimeEnd == value) return; if (Entry == null && LifetimeEnd != value)
if (Entry == null)
throw new InvalidOperationException($"Cannot modify lifetime of {nameof(PoolableDrawableWithLifetime<TEntry>)} when entry is not set"); throw new InvalidOperationException($"Cannot modify lifetime of {nameof(PoolableDrawableWithLifetime<TEntry>)} when entry is not set");
Entry.LifetimeEnd = value; if (Entry != null)
Entry.LifetimeEnd = value;
} }
} }