diff --git a/src/Discord.Net.Core/Entities/Messages/Embed.cs b/src/Discord.Net.Core/Entities/Messages/Embed.cs index f503c343a..43fa587b7 100644 --- a/src/Discord.Net.Core/Entities/Messages/Embed.cs +++ b/src/Discord.Net.Core/Entities/Messages/Embed.cs @@ -109,26 +109,6 @@ namespace Discord => GetHashCode() == embed.GetHashCode(); public override int GetHashCode() - { - var hashCode = new HashCode(); - hashCode.Add(Type); - hashCode.Add(Title); - hashCode.Add(Description); - hashCode.Add(Timestamp); - hashCode.Add(Color); - hashCode.Add(Image); - hashCode.Add(Video); - hashCode.Add(Author); - hashCode.Add(Footer); - hashCode.Add(Provider); - hashCode.Add(Thumbnail); - - foreach (var field in Fields) - { - hashCode.Add(field); - } - - return hashCode.ToHashCode(); - } + => new { Type, Title, Description, Timestamp, Color, Image, Video, Author, Footer, Provider, Thumbnail, Fields }.GetHashCode(); } } diff --git a/src/Discord.Net.Core/Entities/Messages/EmbedAuthor.cs b/src/Discord.Net.Core/Entities/Messages/EmbedAuthor.cs index 12ea10ff7..d0724cfdc 100644 --- a/src/Discord.Net.Core/Entities/Messages/EmbedAuthor.cs +++ b/src/Discord.Net.Core/Entities/Messages/EmbedAuthor.cs @@ -57,6 +57,6 @@ namespace Discord => GetHashCode() == embedAuthor.GetHashCode(); public override int GetHashCode() - => HashCode.Combine(Name, Url, IconUrl); + => new { Name, Url, IconUrl }.GetHashCode(); } } diff --git a/src/Discord.Net.Core/Entities/Messages/EmbedBuilder.cs b/src/Discord.Net.Core/Entities/Messages/EmbedBuilder.cs index a104bc731..2aa32d614 100644 --- a/src/Discord.Net.Core/Entities/Messages/EmbedBuilder.cs +++ b/src/Discord.Net.Core/Entities/Messages/EmbedBuilder.cs @@ -496,25 +496,7 @@ namespace Discord => GetHashCode() == embedBuilder.GetHashCode(); public override int GetHashCode() - { - var hashCode = new HashCode(); - hashCode.Add(_title); - hashCode.Add(_description); - hashCode.Add(_image); - hashCode.Add(_thumbnail); - hashCode.Add(Timestamp); - hashCode.Add(Color); - hashCode.Add(Author); - hashCode.Add(Footer); - hashCode.Add(Url); - - foreach (var field in _fields) - { - hashCode.Add(field); - } - - return hashCode.ToHashCode(); - } + => new {_title, _description, _image, _thumbnail, Timestamp, Color, Author, Footer, Url, _fields }.GetHashCode(); } /// @@ -646,7 +628,7 @@ namespace Discord => GetHashCode() == embedFieldBuilder.GetHashCode(); public override int GetHashCode() - => HashCode.Combine(Name, Value, IsInline); + => new { Name, Value, IsInline }.GetHashCode(); } /// @@ -762,7 +744,7 @@ namespace Discord => GetHashCode() == embedAuthorBuilder.GetHashCode(); public override int GetHashCode() - => HashCode.Combine(Name, Url, IconUrl); + => new { Name, Url, IconUrl }.GetHashCode(); } /// @@ -858,6 +840,6 @@ namespace Discord => GetHashCode() == embedFooterBuilder.GetHashCode(); public override int GetHashCode() - => HashCode.Combine(Text, IconUrl); + => new { Text, IconUrl }.GetHashCode(); } } diff --git a/src/Discord.Net.Core/Entities/Messages/EmbedField.cs b/src/Discord.Net.Core/Entities/Messages/EmbedField.cs index 60a86fd10..54708cc52 100644 --- a/src/Discord.Net.Core/Entities/Messages/EmbedField.cs +++ b/src/Discord.Net.Core/Entities/Messages/EmbedField.cs @@ -52,6 +52,6 @@ namespace Discord => GetHashCode() == embedField.GetHashCode(); public override int GetHashCode() - => HashCode.Combine(Name, Value, Inline); + => new { Name, Value, Inline }.GetHashCode(); } } diff --git a/src/Discord.Net.Core/Entities/Messages/EmbedFooter.cs b/src/Discord.Net.Core/Entities/Messages/EmbedFooter.cs index 838aa4fb5..5206844be 100644 --- a/src/Discord.Net.Core/Entities/Messages/EmbedFooter.cs +++ b/src/Discord.Net.Core/Entities/Messages/EmbedFooter.cs @@ -59,6 +59,6 @@ namespace Discord => GetHashCode() == embedFooter.GetHashCode(); public override int GetHashCode() - => HashCode.Combine(Text, IconUrl, ProxyUrl); + => new { Text, IconUrl, ProxyUrl }.GetHashCode(); } } diff --git a/src/Discord.Net.Core/Entities/Messages/EmbedImage.cs b/src/Discord.Net.Core/Entities/Messages/EmbedImage.cs index 96e0f3316..c4a6abc8a 100644 --- a/src/Discord.Net.Core/Entities/Messages/EmbedImage.cs +++ b/src/Discord.Net.Core/Entities/Messages/EmbedImage.cs @@ -69,6 +69,6 @@ namespace Discord => GetHashCode() == embedImage.GetHashCode(); public override int GetHashCode() - => HashCode.Combine(Height, Width, Url, ProxyUrl); + => new { Height, Width, Url, ProxyUrl }.GetHashCode(); } } diff --git a/src/Discord.Net.Core/Entities/Messages/EmbedProvider.cs b/src/Discord.Net.Core/Entities/Messages/EmbedProvider.cs index dffaf02ea..d9c880e0f 100644 --- a/src/Discord.Net.Core/Entities/Messages/EmbedProvider.cs +++ b/src/Discord.Net.Core/Entities/Messages/EmbedProvider.cs @@ -51,6 +51,6 @@ namespace Discord => GetHashCode() == embedProvider.GetHashCode(); public override int GetHashCode() - => HashCode.Combine(Name, Url); + => new { Name, Url }.GetHashCode(); } } diff --git a/src/Discord.Net.Core/Entities/Messages/EmbedThumbnail.cs b/src/Discord.Net.Core/Entities/Messages/EmbedThumbnail.cs index 06eb7cb9c..30354432c 100644 --- a/src/Discord.Net.Core/Entities/Messages/EmbedThumbnail.cs +++ b/src/Discord.Net.Core/Entities/Messages/EmbedThumbnail.cs @@ -69,6 +69,6 @@ namespace Discord => GetHashCode() == embedThumbnail.GetHashCode(); public override int GetHashCode() - => HashCode.Combine(Width, Height, Url, ProxyUrl); + => new { Width, Height, Url, ProxyUrl }.GetHashCode(); } } diff --git a/src/Discord.Net.Core/Entities/Messages/EmbedVideo.cs b/src/Discord.Net.Core/Entities/Messages/EmbedVideo.cs index 2c77bbf7b..44b11a620 100644 --- a/src/Discord.Net.Core/Entities/Messages/EmbedVideo.cs +++ b/src/Discord.Net.Core/Entities/Messages/EmbedVideo.cs @@ -63,6 +63,6 @@ namespace Discord => GetHashCode() == embedVideo.GetHashCode(); public override int GetHashCode() - => HashCode.Combine(Width, Height, Url); + => new { Width, Height, Url }.GetHashCode(); } }