h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-06 04:53:12 +08:00
Code Issues Releases Wiki Activity

Remove unnecessary null pre-checks

Browse Source
This commit is contained in:
Dean Herbert 2022-08-16 15:36:43 +09:00
parent e636fcd9b8
commit ecb9351bab
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -348,10 +348,10 @@ namespace osu.Game.Rulesets.Osu.Edit
private void mergeSelection() private void mergeSelection()
{ {
if (EditorBeatmap == null || ChangeHandler == null || selectedMergeableObjects.Length < 2) if (selectedMergeableObjects.Length < 2)
return; return;
ChangeHandler.BeginChange(); ChangeHandler?.BeginChange();
// Have an initial slider object. // Have an initial slider object.
var firstHitObject = selectedMergeableObjects[0]; var firstHitObject = selectedMergeableObjects[0];
@ -426,7 +426,7 @@ namespace osu.Game.Rulesets.Osu.Edit
SelectedItems.Clear(); SelectedItems.Clear();
SelectedItems.Add(mergedHitObject); SelectedItems.Add(mergedHitObject);
ChangeHandler.EndChange(); ChangeHandler?.EndChange();
} }
protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<HitObject>> selection) protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<HitObject>> selection)