sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-09 15:47:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Avoid multiple iteration of LINQ query using a local

Browse Source
This commit is contained in:
Dean Herbert 2022-08-16 15:38:13 +09:00
parent 7cc9fdbaa0
commit 0833a6fb9a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
View File

@ -348,13 +348,15 @@ namespace osu.Game.Rulesets.Osu.Edit
private void mergeSelection() private void mergeSelection()
{ {
if (selectedMergeableObjects.Length < 2) var mergeableObjects = selectedMergeableObjects;
if (mergeableObjects.Length < 2)
return; return;
ChangeHandler?.BeginChange(); ChangeHandler?.BeginChange();
// Have an initial slider object. // Have an initial slider object.
var firstHitObject = selectedMergeableObjects[0]; var firstHitObject = mergeableObjects[0];
var mergedHitObject = firstHitObject as Slider ?? new Slider var mergedHitObject = firstHitObject as Slider ?? new Slider
{ {
StartTime = firstHitObject.StartTime, StartTime = firstHitObject.StartTime,
@ -371,7 +373,7 @@ namespace osu.Game.Rulesets.Osu.Edit
// Merge all the selected hit objects into one slider path. // Merge all the selected hit objects into one slider path.
bool lastCircle = firstHitObject is HitCircle; bool lastCircle = firstHitObject is HitCircle;
foreach (var selectedMergeableObject in selectedMergeableObjects.Skip(1)) foreach (var selectedMergeableObject in mergeableObjects.Skip(1))
{ {
if (selectedMergeableObject is IHasPath hasPath) if (selectedMergeableObject is IHasPath hasPath)
{ {
@ -407,14 +409,14 @@ namespace osu.Game.Rulesets.Osu.Edit
// Make sure only the merged hit object is in the beatmap. // Make sure only the merged hit object is in the beatmap.
if (firstHitObject is Slider) if (firstHitObject is Slider)
{ {
foreach (var selectedMergeableObject in selectedMergeableObjects.Skip(1)) foreach (var selectedMergeableObject in mergeableObjects.Skip(1))
{ {
EditorBeatmap.Remove(selectedMergeableObject); EditorBeatmap.Remove(selectedMergeableObject);
} }
} }
else else
{ {
foreach (var selectedMergeableObject in selectedMergeableObjects) foreach (var selectedMergeableObject in mergeableObjects)
{ {
EditorBeatmap.Remove(selectedMergeableObject); EditorBeatmap.Remove(selectedMergeableObject);
} }