From dabe51fc8d06311c3f9d42131f0333d5ef83a598 Mon Sep 17 00:00:00 2001
From: Schuyler Cebulskie <Gawdl3y@gawdl3y.com>
Date: Sun, 9 Oct 2016 14:41:57 -0400
Subject: [PATCH] Reorganise disabledEvents stuff

---
 src/client/Client.js                                  |  7 -------
 src/client/websocket/WebSocketManager.js              | 11 ++++++++---
 .../websocket/packets/WebSocketPacketManager.js       |  4 +---
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/client/Client.js b/src/client/Client.js
index c1b4e78f1..f5327e447 100644
--- a/src/client/Client.js
+++ b/src/client/Client.js
@@ -41,13 +41,6 @@ class Client extends EventEmitter {
       throw new TypeError('The disabledEvents client option must be an array.');
     }
 
-    let disabledEvents = {};
-    for (const event in this.options.disabledEvents) {
-      disabledEvents[event] = true;
-    }
-
-    this.options.disabledEvents = disabledEvents;
-
     /**
      * The REST manager of the client
      * @type {RESTManager}
diff --git a/src/client/websocket/WebSocketManager.js b/src/client/websocket/WebSocketManager.js
index ffc6b2358..aee234cc5 100644
--- a/src/client/websocket/WebSocketManager.js
+++ b/src/client/websocket/WebSocketManager.js
@@ -59,6 +59,13 @@ class WebSocketManager extends EventEmitter {
      */
     this.ws = null;
 
+    /**
+     * An object with keys that are websocket event names that should be ignored
+     * @type {Object}
+     */
+    this.disabledEvents = {};
+    for (const event in client.options.disabledEvents) this.disabledEvents[event] = true;
+
     this.first = true;
   }
 
@@ -69,9 +76,7 @@ class WebSocketManager extends EventEmitter {
   _connect(gateway) {
     this.client.emit('debug', `Connecting to gateway ${gateway}`);
     this.normalReady = false;
-    if (this.status !== Constants.Status.RECONNECTING) {
-      this.status = Constants.Status.CONNECTING;
-    }
+    if (this.status !== Constants.Status.RECONNECTING) this.status = Constants.Status.CONNECTING;
     this.ws = new WebSocket(gateway);
     this.ws.onopen = () => this.eventOpen();
     this.ws.onclose = (d) => this.eventClose(d);
diff --git a/src/client/websocket/packets/WebSocketPacketManager.js b/src/client/websocket/packets/WebSocketPacketManager.js
index 5ef060f0e..0c2b025cc 100644
--- a/src/client/websocket/packets/WebSocketPacketManager.js
+++ b/src/client/websocket/packets/WebSocketPacketManager.js
@@ -84,9 +84,7 @@ class WebSocketPacketManager {
 
     this.setSequence(packet.s);
 
-    if (this.ws.client.options.disabledEvents[packet.t] !== undefined) {
-      return false;
-    }
+    if (this.ws.disabledEvents[packet.t] !== undefined) return false;
 
     if (this.ws.status !== Constants.Status.READY) {
       if (BeforeReadyWhitelist.indexOf(packet.t) === -1) {