From d27970113e7f4b2e1331f2636241192522bbe51f Mon Sep 17 00:00:00 2001 From: Confruggy Date: Mon, 19 Dec 2016 23:20:42 +0100 Subject: [PATCH] Update UserTypeReader.cs --- src/Discord.Net.Commands/Readers/UserTypeReader.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Discord.Net.Commands/Readers/UserTypeReader.cs b/src/Discord.Net.Commands/Readers/UserTypeReader.cs index 31bdd0b58..82e8e9828 100644 --- a/src/Discord.Net.Commands/Readers/UserTypeReader.cs +++ b/src/Discord.Net.Commands/Readers/UserTypeReader.cs @@ -46,13 +46,13 @@ namespace Discord.Commands ushort discriminator; if (ushort.TryParse(input.Substring(index + 1), out discriminator)) { - var channelUser = channelUsers.Where(x => x.DiscriminatorValue == discriminator && - string.Equals(username, x.Username, StringComparison.OrdinalIgnoreCase)).FirstOrDefault(); - AddResult(results, channelUser as T, channelUser.Username == username ? 0.85f : 0.75f); + var channelUser = channelUsers.FirstOrDefault(x => x.DiscriminatorValue == discriminator && + string.Equals(username, x.Username, StringComparison.OrdinalIgnoreCase)); + AddResult(results, channelUser as T, channelUser?.Username == username ? 0.85f : 0.75f); - var guildUser = channelUsers.Where(x => x.DiscriminatorValue == discriminator && - string.Equals(username, x.Username, StringComparison.OrdinalIgnoreCase)).FirstOrDefault(); - AddResult(results, guildUser as T, guildUser.Username == username ? 0.80f : 0.70f); + var guildUser = channelUsers.FirstOrDefault(x => x.DiscriminatorValue == discriminator && + string.Equals(username, x.Username, StringComparison.OrdinalIgnoreCase)); + AddResult(results, guildUser as T, guildUser?.Username == username ? 0.80f : 0.70f); } }