From a51f15b3a666712608ab2812615eb55f822775c4 Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Sun, 12 Jun 2016 21:26:14 -0300
Subject: [PATCH] Fixed retrieving cached users during message downloads

---
 src/Discord.Net/Entities/WebSocket/MessageCache.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Discord.Net/Entities/WebSocket/MessageCache.cs b/src/Discord.Net/Entities/WebSocket/MessageCache.cs
index 0e01c6e26..87b0d7910 100644
--- a/src/Discord.Net/Entities/WebSocket/MessageCache.cs
+++ b/src/Discord.Net/Entities/WebSocket/MessageCache.cs
@@ -118,7 +118,7 @@ namespace Discord
                 var downloadedMessages = await _discord.ApiClient.GetChannelMessagesAsync(_channel.Id, args).ConfigureAwait(false);
                 return cachedMessages.Concat(downloadedMessages.Select(x =>
                 {
-                    var user = _channel.GetUser(x.Id) ?? new User(_channel.Discord, x.Author.Value) as IUser;
+                    var user = _channel.GetUser(x.Author.Value.Id) ?? new User(_channel.Discord, x.Author.Value) as IUser;
                     return new CachedMessage(_channel, user, x);
                 })).ToImmutableArray();
             }