h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 14:27:25 +08:00
Code Issues Releases Wiki Activity

Improve equality implementations

Browse Source
This commit is contained in:
Dean Herbert 2024-03-26 20:21:12 +08:00
parent bb9fa52fda
commit 9474156df4
No known key found for this signature in database
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Online/API/Requests/Responses/APIMenuContent.cs
View File

@ -23,15 +23,7 @@ namespace osu.Game.Online.API.Requests.Responses
return Images.SequenceEqual(other.Images); return Images.SequenceEqual(other.Images);
} }
public override bool Equals(object? obj) public override bool Equals(object? other) => other is APIMenuContent content && Equals(content);
{
if (ReferenceEquals(null, obj)) return false;
if (ReferenceEquals(this, obj)) return true;
if (obj.GetType() != GetType()) return false;
return Equals((APIMenuContent)obj);
}
public override int GetHashCode() public override int GetHashCode()
{ {

17
osu.Game/Online/API/Requests/Responses/APIMenuImage.cs
View File

@ -28,34 +28,27 @@ namespace osu.Game.Online.API.Requests.Responses
/// The time at which this item should begin displaying. If <c>null</c>, will display immediately. /// The time at which this item should begin displaying. If <c>null</c>, will display immediately.
/// </summary> /// </summary>
[JsonProperty(@"begins")] [JsonProperty(@"begins")]
public DateTimeOffset? Begins { get; set; } public DateTimeOffset? Begins { get; init; }
/// <summary> /// <summary>
/// The time at which this item should stop displaying. If <c>null</c>, will display indefinitely. /// The time at which this item should stop displaying. If <c>null</c>, will display indefinitely.
/// </summary> /// </summary>
[JsonProperty(@"expires")] [JsonProperty(@"expires")]
public DateTimeOffset? Expires { get; set; } public DateTimeOffset? Expires { get; init; }
public bool Equals(APIMenuImage? other) public bool Equals(APIMenuImage? other)
{ {
if (ReferenceEquals(null, other)) return false; if (ReferenceEquals(null, other)) return false;
if (ReferenceEquals(this, other)) return true; if (ReferenceEquals(this, other)) return true;
return Image == other.Image && Url == other.Url; return Image == other.Image && Url == other.Url && Begins == other.Begins && Expires == other.Expires;
} }
public override bool Equals(object? obj) public override bool Equals(object? other) => other is APIMenuImage content && Equals(content);
{
if (ReferenceEquals(null, obj)) return false;
if (ReferenceEquals(this, obj)) return true;
if (obj.GetType() != GetType()) return false;
return Equals((APIMenuImage)obj);
}
public override int GetHashCode() public override int GetHashCode()
{ {
return HashCode.Combine(Image, Url); return HashCode.Combine(Image, Url, Begins, Expires);
} }
} }
} }