h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 21:02:55 +08:00
Code Issues Releases Wiki Activity

Replace hashcode override with local equality comparer

Browse Source
This commit is contained in:
smoogipoo 2020-02-16 00:22:14 +09:00
parent a51fdfb95e
commit 17e3470441
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
View File

@ -179,6 +179,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
AddAssert("item 0 is selected", () => playlist.SelectedItem.Value == playlist.Items[0]); AddAssert("item 0 is selected", () => playlist.SelectedItem.Value == playlist.Items[0]);
} }
[Test]
public void TestChangeBeatmapAndRemove()
{
createPlaylist(true, true);
AddStep("change beatmap of first item", () => playlist.Items[0].BeatmapID = 30);
moveToDeleteButton(0);
AddStep("click delete button", () => InputManager.Click(MouseButton.Left));
}
private void moveToItem(int index, Vector2? offset = null) private void moveToItem(int index, Vector2? offset = null)
=> AddStep($"move mouse to item {index}", () => InputManager.MoveMouseTo(playlist.ChildrenOfType<OsuRearrangeableListItem<PlaylistItem>>().ElementAt(index), offset)); => AddStep($"move mouse to item {index}", () => InputManager.MoveMouseTo(playlist.ChildrenOfType<OsuRearrangeableListItem<PlaylistItem>>().ElementAt(index), offset));

7
osu.Game/Online/Multiplayer/PlaylistItem.cs
View File

@ -93,12 +93,5 @@ namespace osu.Game.Online.Multiplayer
public bool ShouldSerializeapiBeatmap() => false; public bool ShouldSerializeapiBeatmap() => false;
public bool Equals(PlaylistItem other) => ID == other?.ID && BeatmapID == other.BeatmapID && RulesetID == other.RulesetID; public bool Equals(PlaylistItem other) => ID == other?.ID && BeatmapID == other.BeatmapID && RulesetID == other.RulesetID;
public override int GetHashCode()
{
// ReSharper disable NonReadonlyMemberInGetHashCode
return HashCode.Combine(ID, BeatmapID, RulesetID);
// ReSharper restore NonReadonlyMemberInGetHashCode
}
} }
} }

14
osu.Game/Online/Multiplayer/Room.cs
View File

@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using Newtonsoft.Json; using Newtonsoft.Json;
using osu.Framework.Allocation; using osu.Framework.Allocation;
@ -124,15 +125,13 @@ namespace osu.Game.Online.Multiplayer
var localItem = Playlist.FirstOrDefault(i => i.BeatmapID == item.BeatmapID); var localItem = Playlist.FirstOrDefault(i => i.BeatmapID == item.BeatmapID);
if (localItem != null) if (localItem != null)
{
item.Beatmap.Value.Metadata = localItem.Beatmap.Value.Metadata; item.Beatmap.Value.Metadata = localItem.Beatmap.Value.Metadata;
} }
}
foreach (var removeableItem in Playlist.Except(other.Playlist).ToArray()) foreach (var removeableItem in Playlist.Except(other.Playlist, new PlaylistEqualityComparer()).ToArray())
Playlist.Remove(removeableItem); Playlist.Remove(removeableItem);
Playlist.AddRange(other.Playlist.Except(Playlist).ToArray()); Playlist.AddRange(other.Playlist.Except(Playlist, new PlaylistEqualityComparer()).ToArray());
foreach (var removedItem in Participants.Except(other.Participants).ToArray()) foreach (var removedItem in Participants.Except(other.Participants).ToArray())
Participants.Remove(removedItem); Participants.Remove(removedItem);
@ -144,5 +143,12 @@ namespace osu.Game.Online.Multiplayer
public bool ShouldSerializeRoomID() => false; public bool ShouldSerializeRoomID() => false;
public bool ShouldSerializeHost() => false; public bool ShouldSerializeHost() => false;
public bool ShouldSerializeEndDate() => false; public bool ShouldSerializeEndDate() => false;
private class PlaylistEqualityComparer : IEqualityComparer<PlaylistItem>
{
public bool Equals(PlaylistItem x, PlaylistItem y) => x?.Equals(y) ?? false;
public int GetHashCode(PlaylistItem obj) => HashCode.Combine(obj.ID, obj.BeatmapID, obj.RulesetID);
}
} }
} }