From 9c1badd2e3771a36c2eea89d090c0db873991f71 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Jul 2019 15:42:54 +0900
Subject: [PATCH] Fix rulesets not matching in dictionary lookups due to
 missing GetHashCode implementation

---
 osu.Game/Rulesets/RulesetInfo.cs  | 14 ++++++++++++++
 osu.Game/Rulesets/RulesetStore.cs |  6 +++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/RulesetInfo.cs b/osu.Game/Rulesets/RulesetInfo.cs
index ca331ec339..8eb2abec79 100644
--- a/osu.Game/Rulesets/RulesetInfo.cs
+++ b/osu.Game/Rulesets/RulesetInfo.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using Newtonsoft.Json;
 
 namespace osu.Game.Rulesets
@@ -23,6 +24,19 @@ namespace osu.Game.Rulesets
 
         public bool Equals(RulesetInfo other) => other != null && ID == other.ID && Available == other.Available && Name == other.Name && InstantiationInfo == other.InstantiationInfo;
 
+        [SuppressMessage("ReSharper", "NonReadonlyMemberInGetHashCode")]
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                var hashCode = ID.HasValue ? ID.GetHashCode() : 0;
+                hashCode = (hashCode * 397) ^ (InstantiationInfo != null ? InstantiationInfo.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ (Name != null ? Name.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ Available.GetHashCode();
+                return hashCode;
+            }
+        }
+
         public override string ToString() => $"{Name} ({ShortName}) ID: {ID}";
     }
 }
diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index fd42f96c92..2d8c9f5b49 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets
         public RulesetStore(IDatabaseContextFactory factory)
             : base(factory)
         {
-            AddMissingRulesets();
+            addMissingRulesets();
         }
 
         /// <summary>
@@ -52,13 +52,13 @@ namespace osu.Game.Rulesets
         /// <summary>
         /// All available rulesets.
         /// </summary>
-        public IEnumerable<RulesetInfo> AvailableRulesets;
+        public IEnumerable<RulesetInfo> AvailableRulesets { get; private set; }
 
         private static Assembly currentDomain_AssemblyResolve(object sender, ResolveEventArgs args) => loaded_assemblies.Keys.FirstOrDefault(a => a.FullName == args.Name);
 
         private const string ruleset_library_prefix = "osu.Game.Rulesets";
 
-        protected void AddMissingRulesets()
+        private void addMissingRulesets()
         {
             using (var usage = ContextFactory.GetForWrite())
             {