sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-07 16:43:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

Use equality comparison rather than hash set

Browse Source
This commit is contained in:
smoogipoo
2020-02-16 16:23:46 +09:00
parent 17e3470441
commit c8b81bcf3c
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,6 @@
// 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;
@ -128,14 +127,17 @@ namespace osu.Game.Online.Multiplayer
item.Beatmap.Value.Metadata = localItem.Beatmap.Value.Metadata; item.Beatmap.Value.Metadata = localItem.Beatmap.Value.Metadata;
} }
foreach (var removeableItem in Playlist.Except(other.Playlist, new PlaylistEqualityComparer()).ToArray()) if (!Playlist.SequenceEqual(other.Playlist))
Playlist.Remove(removeableItem); {
Playlist.Clear();
Playlist.AddRange(other.Playlist);
}
Playlist.AddRange(other.Playlist.Except(Playlist, new PlaylistEqualityComparer()).ToArray()); if (!Participants.SequenceEqual(other.Participants))
{
foreach (var removedItem in Participants.Except(other.Participants).ToArray()) Participants.Clear();
Participants.Remove(removedItem); Participants.AddRange(other.Participants);
Participants.AddRange(other.Participants.Except(Participants).ToArray()); }
Position = other.Position; Position = other.Position;
} }
@ -143,12 +145,5 @@ 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);
}
} }
} }