fix lacking hitobject updates in undo history

OliBomby · Oct 12, 2024 · 20ce649 · 20ce649
1 parent c8e2adc
commit 20ce649
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -283,7 +283,7 @@ private void adjustLength(double proposedDistance, bool adjustVelocity)
 
             Proxy.SetSliderVelocityMultiplier(proposedVelocity);
             Proxy.Path().SetExpectedDistance(proposedDistance);
-            editorBeatmap?.Update(HitObject);
+            editorBeatmap?.AsCommandProxy(commandHandler).Update(HitObject);
         }
 
         /// <summary>

diff --git a/osu.Game/Screens/Edit/Commands/Proxies/CommandProxyExtensions.cs b/osu.Game/Screens/Edit/Commands/Proxies/CommandProxyExtensions.cs
@@ -110,6 +110,9 @@ public static CommandProxy<EditorBeatmap> Add(this CommandProxy<EditorBeatmap> p
         public static CommandProxy<EditorBeatmap> Remove(this CommandProxy<EditorBeatmap> proxy, HitObject hitObject) =>
             proxy.Submit(new RemoveHitObjectCommand(proxy.Target, hitObject));
 
+        public static CommandProxy<EditorBeatmap> Update(this CommandProxy<EditorBeatmap> proxy, HitObject hitObject) =>
+            proxy.Submit(new UpdateHitObjectCommand(proxy.Target, hitObject));
+
         #endregion
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -15,6 +15,7 @@
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Screens.Edit.Commands.Proxies;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
@@ -26,6 +27,9 @@ public partial class EditorBlueprintContainer : BlueprintContainer<HitObject>
         [Resolved]
         protected EditorBeatmap Beatmap { get; private set; }
 
+        [Resolved(canBeNull: true)]
+        private EditorCommandHandler commandHandler { get; set; }
+
         protected readonly HitObjectComposer Composer;
 
         private HitObjectUsageEventBuffer usageEventBuffer;
@@ -88,8 +92,8 @@ protected override bool ApplySnapResult(SelectionBlueprint<HitObject>[] blueprin
                 {
                     Beatmap.PerformOnSelection(obj =>
                     {
-                        obj.StartTime += offset;
-                        Beatmap.Update(obj);
+                        obj.AsCommandProxy(commandHandler).SetStartTime(obj.StartTime + offset);
+                        Beatmap.AsCommandProxy(commandHandler).Update(obj);
                     });
                 }
             }
@@ -119,8 +123,8 @@ protected override void DragOperationCompleted()
             base.DragOperationCompleted();
 
             // handle positional change etc.
-            foreach (var blueprint in SelectionBlueprints)
-                Beatmap.Update(blueprint.Item);
+            foreach (var blueprint in SelectionHandler.SelectedBlueprints)
+                Beatmap.AsCommandProxy(commandHandler).Update(blueprint.Item);
         }
 
         protected override bool OnDoubleClick(DoubleClickEvent e)