From 0e5a1d2df72c9d9226318dd6d7a88e6d029c7b3d Mon Sep 17 00:00:00 2001
From: abalabahaha <hi@abal.moe>
Date: Wed, 11 May 2016 16:42:18 -0700
Subject: [PATCH] Some undefined checking

---
 lib/Client/InternalClient.js | 6 +++---
 lib/Structures/Server.js     | 4 ++--
 src/Client/InternalClient.js | 6 +++---
 src/Structures/Server.js     | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js
index 61bb45ec5..51e04a2a0 100644
--- a/lib/Client/InternalClient.js
+++ b/lib/Client/InternalClient.js
@@ -2127,10 +2127,10 @@ var InternalClient = (function () {
 								return server.roles.get("id", pid);
 							}) : server.memberMap[data.user.id].roles;
 							server.memberMap[data.user.id].mute = data.mute || server.memberMap[data.user.id].mute;
-							server.memberMap[data.user.id].selfMute = data.self_mute || server.memberMap[data.user.id].selfMute;
+							server.memberMap[data.user.id].selfMute = data.self_mute === undefined ? server.memberMap[data.user.id].selfMute : data.self_mute;
 							server.memberMap[data.user.id].deaf = data.deaf || server.memberMap[data.user.id].deaf;
-							server.memberMap[data.user.id].selfDeaf = data.self_deaf || server.memberMap[data.user.id].selfDeaf;
-							server.memberMap[data.user.id].nick = data.nick || server.memberMap[data.user.id].nick || null;
+							server.memberMap[data.user.id].selfDeaf = data.self_deaf === undefined ? server.memberMap[data.user.id].selfDeaf : data.self_deaf;
+							server.memberMap[data.user.id].nick = data.nick === undefined ? server.memberMap[data.user.id].nick : data.nick || null;
 							client.emit("serverMemberUpdated", server, user, oldMember);
 						} else {
 							client.emit("warn", "server member removed but user doesn't exist in cache");
diff --git a/lib/Structures/Server.js b/lib/Structures/Server.js
index e4ba60519..0fb1cbe94 100644
--- a/lib/Structures/Server.js
+++ b/lib/Structures/Server.js
@@ -161,9 +161,9 @@ var Server = (function (_Equality) {
 				var channel = this.channels.get("id", voiceState.channel_id);
 				this.memberMap[_user.id] = this.memberMap[_user.id] || {};
 				this.memberMap[_user.id].mute = voiceState.mute || this.memberMap[_user.id].mute;
-				this.memberMap[_user.id].selfMute = voiceState.self_mute || this.memberMap[_user.id].selfMute;
+				this.memberMap[_user.id].selfMute = voiceState.self_mute === undefined ? this.memberMap[_user.id].selfMute : voiceState.self_mute;
 				this.memberMap[_user.id].deaf = voiceState.deaf || this.memberMap[_user.id].deaf;
-				this.memberMap[_user.id].selfDeaf = voiceState.self_deaf || this.memberMap[_user.id].selfDeaf;
+				this.memberMap[_user.id].selfDeaf = voiceState.self_deaf === undefined ? this.memberMap[_user.id].selfDeaf : voiceState.self_deaf;
 				if (_user && channel) {
 					this.eventVoiceJoin(_user, channel);
 				} else {
diff --git a/src/Client/InternalClient.js b/src/Client/InternalClient.js
index 9e590a456..88e6ee8f5 100644
--- a/src/Client/InternalClient.js
+++ b/src/Client/InternalClient.js
@@ -1821,10 +1821,10 @@ export default class InternalClient {
 							}
 							server.memberMap[data.user.id].roles = data.roles ? data.roles.map(pid => server.roles.get("id", pid)) : server.memberMap[data.user.id].roles;
 							server.memberMap[data.user.id].mute = data.mute || server.memberMap[data.user.id].mute;
-							server.memberMap[data.user.id].selfMute = data.self_mute || server.memberMap[data.user.id].selfMute;
+							server.memberMap[data.user.id].selfMute = data.self_mute === undefined ? server.memberMap[data.user.id].selfMute : data.self_mute;
 							server.memberMap[data.user.id].deaf = data.deaf || server.memberMap[data.user.id].deaf;
-							server.memberMap[data.user.id].selfDeaf = data.self_deaf || server.memberMap[data.user.id].selfDeaf;
-							server.memberMap[data.user.id].nick = data.nick || server.memberMap[data.user.id].nick || null;
+							server.memberMap[data.user.id].selfDeaf = data.self_deaf === undefined ? server.memberMap[data.user.id].selfDeaf : data.self_deaf;
+							server.memberMap[data.user.id].nick = data.nick === undefined ? server.memberMap[data.user.id].nick : data.nick || null;
 							client.emit("serverMemberUpdated", server, user, oldMember);
 						} else {
 							client.emit("warn", "server member removed but user doesn't exist in cache");
diff --git a/src/Structures/Server.js b/src/Structures/Server.js
index b2f69fcc1..ca35afb52 100644
--- a/src/Structures/Server.js
+++ b/src/Structures/Server.js
@@ -96,9 +96,9 @@ export default class Server extends Equality {
 				let channel = this.channels.get("id", voiceState.channel_id);
 				this.memberMap[user.id] = this.memberMap[user.id] || {};
 				this.memberMap[user.id].mute = voiceState.mute || this.memberMap[user.id].mute;
-				this.memberMap[user.id].selfMute = voiceState.self_mute || this.memberMap[user.id].selfMute;
+				this.memberMap[user.id].selfMute = voiceState.self_mute === undefined ? this.memberMap[user.id].selfMute : voiceState.self_mute;
 				this.memberMap[user.id].deaf = voiceState.deaf || this.memberMap[user.id].deaf;
-				this.memberMap[user.id].selfDeaf = voiceState.self_deaf || this.memberMap[user.id].selfDeaf;
+				this.memberMap[user.id].selfDeaf = voiceState.self_deaf === undefined ? this.memberMap[user.id].selfDeaf : voiceState.self_deaf;
 				if (user && channel) {
 					this.eventVoiceJoin(user, channel);
 				} else {