Fixed Channel.GetUser

src/Discord.Net/Models/Channel.cs

@@ -547,9 +547,14 @@ namespace Discord
         }
         public User GetUser(ulong id)
         {
-            if (!Client.Config.UsePermissionsCache)
+            if (IsPrivate)
             {
-                if (Server != null)
+                if (id == Recipient.Id)
+                    return Recipient;
+                else if (id == Client.PrivateUser.Id)
+                    return Client.PrivateUser;
+            }
+            else if (!Client.Config.UsePermissionsCache)
             {
                 var user = Server.GetUser(id);
                 if (user != null)
@@ -561,21 +566,12 @@ namespace Discord
                 }
             }
             else
-                {
-                    if (id == Recipient.Id)
-                        return Recipient;
-                    else if (id == Client.PrivateUser.Id)
-                        return Client.PrivateUser;
-                }
-                return null;
-            }
-            else
             {
                 Member result;
                 if (_users.TryGetValue(id, out result))
                     return result.User;
-                return null;
             }
+            return null;
         }
         #endregion