RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-14 19:06:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-chat-after-disconnect

Browse Source
This commit is contained in:
Dan Balasescu 2017-05-17 17:51:35 +09:00 committed by GitHub
commit b21be8f3f5
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Online/Chat/Channel.cs
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;

14
osu.Game/Online/Chat/Message.cs
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