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

Precondition against entryMap intead of parentMap

Browse Source
This commit is contained in:
Dan Balasescu
2022-09-15 15:40:03 +09:00
parent 31bc067dd1
commit 68e4d22898
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Rulesets/Objects/Pooling/HitObjectEntryManager.cs
View File

@ -50,10 +50,11 @@ namespace osu.Game.Rulesets.Objects.Pooling
public void Add(HitObjectLifetimeEntry entry, HitObject? parent) public void Add(HitObjectLifetimeEntry entry, HitObject? parent)
{ {
if (parentMap.ContainsKey(entry)) HitObject hitObject = entry.HitObject;
if (entryMap.ContainsKey(hitObject))
throw new InvalidOperationException($@"The {nameof(HitObjectLifetimeEntry)} is already added to this {nameof(HitObjectEntryManager)}."); throw new InvalidOperationException($@"The {nameof(HitObjectLifetimeEntry)} is already added to this {nameof(HitObjectEntryManager)}.");
var hitObject = entry.HitObject;
entryMap[hitObject] = entry; entryMap[hitObject] = entry;
childrenMap[hitObject] = new List<HitObjectLifetimeEntry>(); childrenMap[hitObject] = new List<HitObjectLifetimeEntry>();
@ -70,17 +71,18 @@ namespace osu.Game.Rulesets.Objects.Pooling
public void Remove(HitObjectLifetimeEntry entry) public void Remove(HitObjectLifetimeEntry entry)
{ {
if (!parentMap.ContainsKey(entry)) HitObject hitObject = entry.HitObject;
if (!entryMap.ContainsKey(hitObject))
throw new InvalidOperationException($@"The {nameof(HitObjectLifetimeEntry)} is not contained in this {nameof(HitObjectLifetimeEntry)}."); throw new InvalidOperationException($@"The {nameof(HitObjectLifetimeEntry)} is not contained in this {nameof(HitObjectLifetimeEntry)}.");
var hitObject = entry.HitObject;
entryMap.Remove(hitObject); entryMap.Remove(hitObject);
if (parentMap.Remove(entry, out var parent) && childrenMap.TryGetValue(parent, out var parentChildEntries)) if (parentMap.Remove(entry, out var parent) && childrenMap.TryGetValue(parent, out var parentChildEntries))
parentChildEntries.Remove(entry); parentChildEntries.Remove(entry);
// Remove all entries of the nested hit objects // Remove all entries of the nested hit objects
if (childrenMap.Remove(entry.HitObject, out var childEntries)) if (childrenMap.Remove(hitObject, out var childEntries))
{ {
foreach (var childEntry in childEntries) foreach (var childEntry in childEntries)
Remove(childEntry); Remove(childEntry);