From 10683de578590d9a17c690df4ef9fc89515599a5 Mon Sep 17 00:00:00 2001
From: Arthur Araujo <arthur.araujo@tutanota.com>
Date: Tue, 26 Mar 2024 04:59:47 -0300
Subject: [PATCH] Use order of new combo flags instead of `StartTime`

---
 .../Edit/CatchSelectionHandler.cs             | 22 +++++++------------
 .../Edit/OsuSelectionHandler.cs               | 22 +++++++------------
 2 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Edit/CatchSelectionHandler.cs b/osu.Game.Rulesets.Catch/Edit/CatchSelectionHandler.cs
index e3d82cc517..e3d2347c4d 100644
--- a/osu.Game.Rulesets.Catch/Edit/CatchSelectionHandler.cs
+++ b/osu.Game.Rulesets.Catch/Edit/CatchSelectionHandler.cs
@@ -81,12 +81,13 @@ namespace osu.Game.Rulesets.Catch.Edit
             double selectionStartTime = SelectedItems.Min(h => h.StartTime);
             double selectionEndTime = SelectedItems.Max(h => h.GetEndTime());
 
-            var newComboPlaces = hitObjects
+            var newComboOrder = hitObjects
                 .OfType<CatchHitObject>()
-                .Where(h => h.NewCombo)
-                .Select(obj => obj.StartTime)
+                .Select(obj => obj.NewCombo)
                 .ToList();
 
+            newComboOrder.Reverse();
+
             foreach (var h in hitObjects)
             {
                 h.StartTime = selectionEndTime - (h.GetEndTime() - selectionStartTime);
@@ -100,18 +101,11 @@ namespace osu.Game.Rulesets.Catch.Edit
                 }
             }
 
-            foreach (var h in hitObjects)
+            int i = 0;
+            foreach (bool newCombo in newComboOrder)
             {
-                if (h is CatchHitObject obj) obj.NewCombo = false;
-            }
-
-            foreach (double place in newComboPlaces)
-            {
-                hitObjects
-                    .OfType<CatchHitObject>()
-                    .Where(obj => obj.StartTime == place)
-                    .ToList()
-                    .ForEach(obj => obj.NewCombo = true);
+                hitObjects.OfType<CatchHitObject>().ToList()[i].NewCombo = newCombo;
+                i++;
             }
 
             return true;
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index b4980b55d4..df39ab8fce 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -85,12 +85,13 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             bool moreThanOneObject = hitObjects.Count > 1;
 
-            var newComboPlaces = hitObjects
+            var newComboOrder = hitObjects
                 .OfType<OsuHitObject>()
-                .Where(h => h.NewCombo)
-                .Select(obj => obj.StartTime)
+                .Select(obj => obj.NewCombo)
                 .ToList();
 
+            newComboOrder.Reverse();
+
             foreach (var h in hitObjects)
             {
                 if (moreThanOneObject)
@@ -103,18 +104,11 @@ namespace osu.Game.Rulesets.Osu.Edit
                 }
             }
 
-            foreach (var h in hitObjects)
+            int i = 0;
+            foreach (bool newCombo in newComboOrder)
             {
-                if (h is OsuHitObject obj) obj.NewCombo = false;
-            }
-
-            foreach (double place in newComboPlaces)
-            {
-                hitObjects
-                    .OfType<OsuHitObject>()
-                    .Where(obj => obj.StartTime == place)
-                    .ToList()
-                    .ForEach(obj => obj.NewCombo = true);
+                hitObjects.OfType<OsuHitObject>().ToList()[i].NewCombo = newCombo;
+                i++;
             }
 
             return true;