From b9d7ed2a316eb4b24a613bc24b9acc3c8fdc9960 Mon Sep 17 00:00:00 2001
From: hydrabolt <amishshah.2k@gmail.com>
Date: Wed, 28 Oct 2015 16:12:38 +0000
Subject: [PATCH] Fixed bug where joinServer may never respond

---
 lib/Client.js | 24 ++++++++++--------------
 src/Client.js | 24 ++++++++++--------------
 2 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/lib/Client.js b/lib/Client.js
index 291d695f3..8b3b221bc 100644
--- a/lib/Client.js
+++ b/lib/Client.js
@@ -1309,20 +1309,16 @@ var Client = (function (_EventEmitter) {
        
        }*/
 
-					if (data.owner_id === self.user.id) {
-						var keepCheck = setInterval(function () {
-							if (self.serverCreateListener[data.id]) {
-								var cbs = self.serverCreateListener[data.id];
-								cbs[0](server); //promise then callback
-								cbs[1](null, server); //legacy callback
-								self.serverCreateListener[data.id] = null;
-								self.emit("serverCreate", server);
-								clearInterval(keepCheck);
-							}
-						}, 50);
-					} else {
-						self.emit("serverCreate", server);
-					}
+					var keepCheck = setInterval(function () {
+						if (self.serverCreateListener[data.id]) {
+							var cbs = self.serverCreateListener[data.id];
+							cbs[0](server); //promise then callback
+							cbs[1](null, server); //legacy callback
+							self.serverCreateListener[data.id] = null;
+							self.emit("serverCreate", server);
+							clearInterval(keepCheck);
+						}
+					}, 50);
 
 					break;
 
diff --git a/src/Client.js b/src/Client.js
index 37b03e9c6..7ca61cdad 100644
--- a/src/Client.js
+++ b/src/Client.js
@@ -1337,20 +1337,16 @@ class Client extends EventEmitter {
 						
 					}*/
 
-					if(data.owner_id === self.user.id){
-						var keepCheck = setInterval(() => {
-							if (self.serverCreateListener[data.id]) {
-								var cbs = self.serverCreateListener[data.id];
-								cbs[0](server); //promise then callback
-								cbs[1](null, server); //legacy callback
-								self.serverCreateListener[data.id] = null;
-								self.emit("serverCreate", server);
-								clearInterval(keepCheck);
-							}
-						}, 50);
-					}else{
-						self.emit("serverCreate", server);	
-					}
+					var keepCheck = setInterval(() => {
+						if (self.serverCreateListener[data.id]) {
+							var cbs = self.serverCreateListener[data.id];
+							cbs[0](server); //promise then callback
+							cbs[1](null, server); //legacy callback
+							self.serverCreateListener[data.id] = null;
+							self.emit("serverCreate", server);
+							clearInterval(keepCheck);
+						}
+					}, 50);
 
 					break;