h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-04 23:02:56 +08:00
Code Issues Releases Wiki Activity

Add RulesetInfo hashcode implementation and tidy up equality

Browse Source
This commit is contained in:
Dean Herbert 2022-01-10 16:31:50 +09:00
parent c33e163178
commit 5cbd731864
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game.Tests/Visual/Gameplay/TestScenePlayerScoreSubmission.cs
View File

@ -255,7 +255,15 @@ namespace osu.Game.Tests.Visual.Gameplay
{ {
prepareTestAPI(true); prepareTestAPI(true);
createPlayerTest(false, createRuleset: () => new OsuRuleset { RulesetInfo = { OnlineID = rulesetId ?? -1 } }); createPlayerTest(false, createRuleset: () => new OsuRuleset
{
RulesetInfo =
{
Name = "custom",
ShortName = $"custom{rulesetId}",
OnlineID = rulesetId ?? -1
}
});
AddUntilStep("wait for token request", () => Player.TokenCreationRequested); AddUntilStep("wait for token request", () => Player.TokenCreationRequested);

21
osu.Game/Rulesets/RulesetInfo.cs
View File

@ -47,14 +47,25 @@ namespace osu.Game.Rulesets
public bool Available { get; set; } public bool Available { get; set; }
public bool Equals(RulesetInfo? other) => other != null public bool Equals(RulesetInfo? other)
&& OnlineID == other.OnlineID {
&& Available == other.Available if (ReferenceEquals(this, other)) return true;
&& Name == other.Name if (other == null) return false;
&& InstantiationInfo == other.InstantiationInfo;
return ShortName == other.ShortName;
}
public bool Equals(IRulesetInfo? other) => other is RulesetInfo b && Equals(b); public bool Equals(IRulesetInfo? other) => other is RulesetInfo b && Equals(b);
public override int GetHashCode()
{
// Importantly, ignore the underlying realm hash code, as it will usually not match.
var hashCode = new HashCode();
// ReSharper disable once NonReadonlyMemberInGetHashCode
hashCode.Add(ShortName);
return hashCode.ToHashCode();
}
public override string ToString() => Name; public override string ToString() => Name;
public RulesetInfo Clone() => new RulesetInfo public RulesetInfo Clone() => new RulesetInfo