From 702125fdc67796314b75fa0dfb5fc9472bdd5ba2 Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Sun, 14 Feb 2016 21:58:55 -0400
Subject: [PATCH] Stop adding users on PRESENCE_UPDATE

---
 src/Discord.Net/DiscordClient.cs | 2 +-
 src/Discord.Net/Models/Server.cs | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs
index 1d3343f16..01098cab0 100644
--- a/src/Discord.Net/DiscordClient.cs
+++ b/src/Discord.Net/DiscordClient.cs
@@ -902,7 +902,7 @@ namespace Discord
                                     break;
                                 }
                                 else
-                                    user = server.AddUser(data.User.Id);
+                                    user = server.GetUser(data.User.Id);
                             }
 
                             if (user != null)
diff --git a/src/Discord.Net/Models/Server.cs b/src/Discord.Net/Models/Server.cs
index 6fb42ed92..aaed6aac8 100644
--- a/src/Discord.Net/Models/Server.cs
+++ b/src/Discord.Net/Models/Server.cs
@@ -456,8 +456,8 @@ namespace Discord
             
             if (_users.TryGetOrAdd(id, member, out member))
             {
-                foreach (var channel in AllChannels)
-                    channel.AddUser(member.User);
+                foreach (var channel in _channels)
+                    channel.Value.AddUser(member.User);
             }
             return member.User;
         }
@@ -467,8 +467,8 @@ namespace Discord
             Member member;
             if (_users.TryRemove(id, out member))
             {
-                foreach (var channel in AllChannels)
-                    channel.RemoveUser(id);
+                foreach (var channel in _channels)
+                    channel.Value.RemoveUser(id);
                 return member.User;
             }
             return null;