Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-16 19:43:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into indev

Browse Source 
# Conflicts:
#	src/structures/Guild.js
This commit is contained in:
Schuyler Cebulskie
2016-09-09 00:45:35 -04:00
parent 9682adb9fe 8f04fae4c0
commit 01d032abee
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/structures/Guild.js
View File

@@ -615,7 +615,7 @@ class Guild {
if (data.roles) member._roles = data.roles; if (data.roles) member._roles = data.roles;
else member.nickname = data.nick; else member.nickname = data.nick;
const notSame = member.nickname !== oldMember.nickname && !arraysEqual(member._roles, oldMember._roles); const notSame = member.nickname !== oldMember.nickname || !arraysEqual(member._roles, oldMember._roles);
if (this.client.ws.status === Constants.Status.READY && notSame) { if (this.client.ws.status === Constants.Status.READY && notSame) {
/** /**