Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-18 12:33:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

ready event will now throw errors properly (#1440)

Browse Source
This commit is contained in:
Drahcirius
2017-05-01 03:43:35 -04:00
committed by Amish Shah
parent 892ba67d71
commit 166161d6d3
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/client/websocket/WebSocketConnection.js
View File

@@ -273,12 +273,11 @@ class WebSocketConnection extends EventEmitter {
*/ */
onMessage(event) { onMessage(event) {
try { try {
this.onPacket(this.unpack(event.data)); event.data = this.unpack(event.data);
return true;
} catch (err) { } catch (err) {
this.debug(err); this.emit('debug', err);
return false;
} }
return this.onPacket(event.data);
} }
/** /**

6
src/client/websocket/packets/WebSocketPacketManager.js
View File

@@ -99,11 +99,7 @@ class WebSocketPacketManager {
} }
if (!queue && this.queue.length > 0) this.handleQueue(); if (!queue && this.queue.length > 0) this.handleQueue();
try { if (this.handlers[packet.t]) return this.handlers[packet.t].handle(packet);
if (this.handlers[packet.t]) return this.handlers[packet.t].handle(packet);
} catch (error) {
this.client.emit(Constants.Events.ERROR, error);
}
return false; return false;
} }
} }