From bcbf1bc5c64f8882b3b1db909f766c45f5e6f007 Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Thu, 19 May 2016 00:04:25 -0300
Subject: [PATCH] Fixed setting other users' nicknames

---
 src/Discord.Net/Models/User.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Discord.Net/Models/User.cs b/src/Discord.Net/Models/User.cs
index 4df50c4a6..ca2273786 100644
--- a/src/Discord.Net/Models/User.cs
+++ b/src/Discord.Net/Models/User.cs
@@ -270,13 +270,14 @@ namespace Discord
             }
             if (!isCurrentUser || isMuted != null || isDeafened != null | voiceChannel != null || roles != null)
             {
+                if (nickname == "") nickname = Nickname;
                 var request = new UpdateMemberRequest(Server.Id, Id)
                 {
                     IsMuted = isMuted ?? IsServerMuted,
                     IsDeafened = isDeafened ?? IsServerDeafened,
                     VoiceChannelId = voiceChannel?.Id,
                     RoleIds = roleIds,
-                    Nickname = (nickname == "") ? Nickname : nickname
+                    Nickname = nickname ?? ""
                 };
                 await Client.ClientAPI.Send(request).ConfigureAwait(false);
             }