h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-06-07 04:13:38 +08:00
Code Issues Releases Wiki Activity

Merge pull request #776 from peppy/fix-duplicate-messages

Browse Source 
Revert "Use generic IComparable for message."
This commit is contained in:
Dan Balasescu
2017-05-17 13:51:13 +09:00
committed by GitHub
Unverified
parent c78f4cc7ab 78c1d4581f
commit 12716d2ab4
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Online/Chat/Channel.cs
+1 -1
View File
@@ -23,7 +23,7 @@ namespace osu.Game.Online.Chat
[JsonProperty(@"channel_id")]
public int Id;
public readonly SortedList<Message> Messages = new SortedList<Message>(Comparer<Message>.Default);
public readonly SortedList<Message> Messages = new SortedList<Message>((m1, m2) => m1.Id.CompareTo(m2.Id));
//internal bool Joined;
osu.Game/Online/Chat/Message.cs
+12 -2
View File
@@ -8,7 +8,7 @@ using osu.Game.Users;
namespace osu.Game.Online.Chat
{
public class Message : IComparable<Message>
public class Message
{
[JsonProperty(@"message_id")]
public readonly long Id;
@@ -42,7 +42,17 @@ namespace osu.Game.Online.Chat
Id = id;
}
public int CompareTo(Message other) => Id.CompareTo(other.Id);
public override bool Equals(object obj)
{
var objMessage = obj as Message;
return Id == objMessage?.Id;
}
public override int GetHashCode()
{
return Id.GetHashCode();
}
}
public enum TargetType