From 5efcdbd431153a902fd510d727f9b02400afcb66 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 28 Dec 2020 15:19:28 +0300
Subject: [PATCH] Fix IMod now using reference equality as well

---
 osu.Game/Online/API/APIMod.cs  | 3 ++-
 osu.Game/Rulesets/Mods/IMod.cs | 3 ++-
 osu.Game/Rulesets/Mods/Mod.cs  | 3 ++-
 osu.Game/Scoring/ScoreInfo.cs  | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
index f4e0e1b11f..c1b243c743 100644
--- a/osu.Game/Online/API/APIMod.cs
+++ b/osu.Game/Online/API/APIMod.cs
@@ -52,7 +52,8 @@ namespace osu.Game.Online.API
             return resultMod;
         }
 
-        public bool Equals(APIMod other) => Acronym == other?.Acronym;
+        public bool Equals(IMod other) => other is APIMod them && Equals(them);
+        public bool Equals(APIMod other) => ((IMod)this).Equals(other);
 
         public override string ToString()
         {
diff --git a/osu.Game/Rulesets/Mods/IMod.cs b/osu.Game/Rulesets/Mods/IMod.cs
index 448ad0eb30..a5e19f293c 100644
--- a/osu.Game/Rulesets/Mods/IMod.cs
+++ b/osu.Game/Rulesets/Mods/IMod.cs
@@ -1,11 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using Newtonsoft.Json;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public interface IMod
+    public interface IMod : IEquatable<IMod>
     {
         /// <summary>
         /// The shortened name of this mod.
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 33550e070b..3ccebe4174 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -149,6 +149,7 @@ namespace osu.Game.Rulesets.Mods
             return copy;
         }
 
-        public bool Equals(Mod other) => GetType() == other?.GetType();
+        public bool Equals(IMod other) => other is Mod them && Equals(them);
+        public bool Equals(Mod other) => Acronym == other?.Acronym;
     }
 }
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 59eaa994c2..335671ea4e 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -256,7 +256,8 @@ namespace osu.Game.Scoring
         {
             public string Acronym { get; set; }
 
-            public bool Equals(DeserializedMod other) => Acronym == other?.Acronym;
+            bool IEquatable<IMod>.Equals(IMod other) => other is DeserializedMod them && Equals(them);
+            public bool Equals(DeserializedMod other) => ((IMod)this).Equals(other);
         }
 
         public override string ToString() => $"{User} playing {Beatmap}";