fix: address 76 CI test failures across encoder, HitObjectContainer, skin editor, and GC tests

Author: Copilot

osu.Game.Tests/Visual/Gameplay/TestScenePlayerReferenceLeaking.cs

@@ -22,8 +22,13 @@ protected override void AddCheckSteps()
         {
             AddUntilStep("no leaked beatmaps", () =>
             {
-                GC.Collect();
-                GC.WaitForPendingFinalizers();
+                // Run multiple GC passes to handle finalizer queues and large object heap.
+                for (int i = 0; i < 3; i++)
+                {
+                    GC.Collect(GC.MaxGeneration, GCCollectionMode.Forced, blocking: true, compacting: false);
+                    GC.WaitForPendingFinalizers();
+                }
+
                 int count = 0;
 
                 foreach (var unused in workingWeakReferences)
@@ -34,8 +39,12 @@ protected override void AddCheckSteps()
 
             AddUntilStep("no leaked players", () =>
             {
-                GC.Collect();
-                GC.WaitForPendingFinalizers();
+                for (int i = 0; i < 3; i++)
+                {
+                    GC.Collect(GC.MaxGeneration, GCCollectionMode.Forced, blocking: true, compacting: false);
+                    GC.WaitForPendingFinalizers();
+                }
+
                 int count = 0;
 
                 foreach (var unused in playerWeakReferences)

osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs

@@ -52,9 +52,10 @@ public partial class TestSceneSkinEditor : PlayerTestScene
         [SetUpSteps]
         public override void SetUpSteps()
         {
+            AddStep("reset skin", () => skins.CurrentSkinInfo.SetDefault());
+
             base.SetUpSteps();
 
-            AddStep("reset skin", () => skins.CurrentSkinInfo.SetDefault());
             AddUntilStep("wait for hud load", () => targetContainer.ComponentsLoaded);
 
             AddStep("reload skin editor", () =>

osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs

@@ -591,10 +591,6 @@ private LegacyHitSoundType toLegacyHitSoundType(IList<HitSampleInfo> samples)
             {
                 switch (sample.Name)
                 {
-                    case HitSampleInfo.HIT_NORMAL:
-                        type |= LegacyHitSoundType.Normal;
-                        break;
-
                     case HitSampleInfo.HIT_WHISTLE:
                         type |= LegacyHitSoundType.Whistle;
                         break;

osu.Game/Rulesets/UI/HitObjectContainer.cs

@@ -128,7 +128,13 @@ protected sealed override DrawableHitObject GetDrawable(HitObjectLifetimeEntry e
 
         protected override void AddDrawable(HitObjectLifetimeEntry entry, DrawableHitObject drawable)
         {
-            if (nonPooledDrawableMap.ContainsKey(entry)) return;
+            if (nonPooledDrawableMap.ContainsKey(entry))
+            {
+                // Non-pooled drawables are permanently present in InternalChildren.
+                // Only insert into the alive-objects cache when the entry becomes alive.
+                insertIntoAliveCache(drawable);
+                return;
+            }
 
             addDrawable(drawable);
             HitObjectUsageBegan?.Invoke(entry.HitObject);
@@ -137,22 +143,21 @@ protected override void AddDrawable(HitObjectLifetimeEntry entry, DrawableHitObj
         protected override void RemoveDrawable(HitObjectLifetimeEntry entry, DrawableHitObject drawable)
         {
             drawable.OnKilled();
-            if (nonPooledDrawableMap.ContainsKey(entry)) return;
+
+            if (nonPooledDrawableMap.ContainsKey(entry))
+            {
+                // Non-pooled drawables stay in InternalChildren; only remove from alive cache.
+                aliveObjectsSortedCache.Remove(drawable);
+                return;
+            }
 
             removeDrawable(drawable);
             HitObjectUsageFinished?.Invoke(entry.HitObject);
         }
 
-        private void addDrawable(DrawableHitObject drawable)
+        private void insertIntoAliveCache(DrawableHitObject drawable)
         {
             // Binary-search insertion to keep aliveObjectsSortedCache in StartTime order.
-            // O(log n) search + O(n) shift — far cheaper than rebuilding & sorting
-            // the entire list from scratch on every alive-state transition.
-            // Note: `<=` means new objects with the same StartTime are appended after
-            // existing ones (stable insertion order within a tie group).  The full
-            // visual-tree Compare also applies CompareReverseChildID as a tie-breaker,
-            // but AliveObjects consumers (e.g. cursor particles) don't require that
-            // level of ordering stability.
             double startTime = drawable.HitObject.StartTime;
             int lo = 0, hi = aliveObjectsSortedCache.Count;
 
@@ -167,6 +172,11 @@ private void addDrawable(DrawableHitObject drawable)
             }
 
             aliveObjectsSortedCache.Insert(lo, drawable);
+        }
+
+        private void addDrawable(DrawableHitObject drawable)
+        {
+            insertIntoAliveCache(drawable);
 
             drawable.OnNewResult += onNewResult;
 
@@ -196,7 +206,13 @@ public virtual void Add(DrawableHitObject drawable)
                 throw new InvalidOperationException($"May not add a {nameof(DrawableHitObject)} without {nameof(HitObject)} associated");
 
             nonPooledDrawableMap.Add(drawable.Entry, drawable);
-            addDrawable(drawable);
+
+            // Set up permanent bindings once. The alive-objects cache is managed via
+            // AddDrawable/RemoveDrawable callbacks when the lifetime entry becomes alive/dead.
+            drawable.OnNewResult += onNewResult;
+            bindStartTime(drawable);
+            AddInternal(drawable);
+
             Add(drawable.Entry);
         }