From 5b8f882a0fade4ed455d1cbe410946d2c418fa7a Mon Sep 17 00:00:00 2001
From: Amish Shah <amishshah.2k@gmail.com>
Date: Sun, 11 Sep 2016 11:50:10 +0100
Subject: [PATCH] fix avatars being set to undefined

---
 .../websocket/packets/handlers/PresenceUpdate.js     |  2 --
 src/structures/User.js                               | 12 +++++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/client/websocket/packets/handlers/PresenceUpdate.js b/src/client/websocket/packets/handlers/PresenceUpdate.js
index 9f5fdade9..3139ff363 100644
--- a/src/client/websocket/packets/handlers/PresenceUpdate.js
+++ b/src/client/websocket/packets/handlers/PresenceUpdate.js
@@ -34,8 +34,6 @@ class PresenceUpdateHandler extends AbstractHandler {
     data.user.username = data.user.username || user.username;
     data.user.id = data.user.id || user.id;
     data.user.discriminator = data.user.discriminator || user.discriminator;
-    // comment out avatar patching as it causes bugs (see #297)
-    // data.user.avatar = data.user.avatar || user.avatar;
     data.user.status = data.status || user.status;
     data.user.game = data.game;
 
diff --git a/src/structures/User.js b/src/structures/User.js
index 2b91c340d..700ecd6a6 100644
--- a/src/structures/User.js
+++ b/src/structures/User.js
@@ -36,11 +36,13 @@ class User {
      */
     this.discriminator = data.discriminator;
 
-    /**
-     * The ID of the user's avatar
-     * @type {string}
-     */
-    this.avatar = data.avatar;
+    if (typeof data.avatar !== 'undefined') {
+      /**
+       * The ID of the user's avatar
+       * @type {string}
+       */
+      this.avatar = data.avatar;
+    }
 
     /**
      * Whether or not the User is a Bot.