Merge branch 'master' into indev-prism

This commit is contained in:
Schuyler Cebulskie
2017-02-06 01:54:31 -05:00
17 changed files with 167 additions and 120 deletions

View File

@@ -18,13 +18,13 @@ class ClientVoiceManager {
/**
* A collection mapping connection IDs to the Connection objects
* @type {Collection<string, VoiceConnection>}
* @type {Collection<Snowflake, VoiceConnection>}
*/
this.connections = new Collection();
/**
* Pending connection attempts, maps guild ID to VoiceChannel
* @type {Collection<string, VoiceChannel>}
* @type {Collection<Snowflake, VoiceChannel>}
*/
this.pending = new Collection();