Merge master

This commit is contained in:
Schuyler Cebulskie
2016-10-01 03:44:43 -04:00
2 changed files with 3 additions and 3 deletions

File diff suppressed because one or more lines are too long

View File

@@ -114,8 +114,8 @@ class Guild {
this.features = data.features;
/**
* An array of guild emojis.
* @type {Object[]}
* A Collection of emojis that are in this Guild. The key is the emoji's ID, the value is the emoji.
* @type {Collection<string, Emoji>}
*/
this.emojis = new Collection();
for (const emoji of data.emojis) this.emojis.set(emoji.id, new Emoji(this, emoji));