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

Fix bad equality comparer implementations

Browse Source
This commit is contained in:
smoogipoo 2020-12-01 18:09:21 +09:00
parent b780fdbe4c
commit dda4d76d72
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Catch/Objects/Banana.cs
View File

@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Catch.Objects
=> other != null; => other != null;
public override bool Equals(object obj) public override bool Equals(object obj)
=> Equals((BananaHitSampleInfo)obj); => obj is BananaHitSampleInfo other && Equals(other);
public override int GetHashCode() => lookup_names.GetHashCode(); public override int GetHashCode() => lookup_names.GetHashCode();
} }

2
osu.Game/Audio/HitSampleInfo.cs
View File

@ -83,7 +83,7 @@ namespace osu.Game.Audio
=> other != null && Name == other.Name && Bank == other.Bank && Suffix == other.Suffix; => other != null && Name == other.Name && Bank == other.Bank && Suffix == other.Suffix;
public override bool Equals(object? obj) public override bool Equals(object? obj)
=> Equals((HitSampleInfo?)obj); => obj is HitSampleInfo other && Equals(other);
public override int GetHashCode() => HashCode.Combine(Name, Bank, Suffix); public override int GetHashCode() => HashCode.Combine(Name, Bank, Suffix);
} }

5
osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
View File

@ -496,7 +496,8 @@ namespace osu.Game.Rulesets.Objects.Legacy
public bool Equals(LegacyHitSampleInfo? other) public bool Equals(LegacyHitSampleInfo? other)
=> base.Equals(other) && CustomSampleBank == other.CustomSampleBank && IsLayered == other.IsLayered; => base.Equals(other) && CustomSampleBank == other.CustomSampleBank && IsLayered == other.IsLayered;
public override bool Equals(object? obj) => Equals((LegacyHitSampleInfo?)obj); public override bool Equals(object? obj)
=> obj is LegacyHitSampleInfo other && Equals(other);
public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), CustomSampleBank, IsLayered); public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), CustomSampleBank, IsLayered);
} }
@ -529,7 +530,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
=> base.Equals(other) && Filename == other.Filename; => base.Equals(other) && Filename == other.Filename;
public override bool Equals(object? obj) public override bool Equals(object? obj)
=> Equals((FileHitSampleInfo?)obj); => obj is FileHitSampleInfo other && Equals(other);
public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), Filename); public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), Filename);
} }