From 3befb49ea9e5ed6420c053ba4b07bd58f56fac75 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 14:51:57 +0900
Subject: [PATCH] Fix system messages always being displayed above standard
 messages

Closes https://github.com/ppy/osu/issues/12509.
---
 osu.Game/Online/Chat/InfoMessage.cs | 4 +---
 osu.Game/Online/Chat/Message.cs     | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Chat/InfoMessage.cs b/osu.Game/Online/Chat/InfoMessage.cs
index 8dce188804..cea336aae2 100644
--- a/osu.Game/Online/Chat/InfoMessage.cs
+++ b/osu.Game/Online/Chat/InfoMessage.cs
@@ -8,10 +8,8 @@ namespace osu.Game.Online.Chat
 {
     public class InfoMessage : LocalMessage
     {
-        private static int infoID = -1;
-
         public InfoMessage(string message)
-            : base(infoID--)
+            : base(null)
         {
             Timestamp = DateTimeOffset.Now;
             Content = message;
diff --git a/osu.Game/Online/Chat/Message.cs b/osu.Game/Online/Chat/Message.cs
index 2e41038a59..30753b3920 100644
--- a/osu.Game/Online/Chat/Message.cs
+++ b/osu.Game/Online/Chat/Message.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Online.Chat
             return Id.Value.CompareTo(other.Id.Value);
         }
 
-        public virtual bool Equals(Message other) => Id == other?.Id;
+        public virtual bool Equals(Message other) => Id.HasValue && Id == other?.Id;
 
         // ReSharper disable once ImpureMethodCallOnReadonlyValueField
         public override int GetHashCode() => Id.GetHashCode();