Fixed bug where joinServer may never respond

This commit is contained in:
hydrabolt
2015-10-28 16:12:38 +00:00
parent 834825a09d
commit b9d7ed2a31
2 changed files with 20 additions and 28 deletions

View File

@@ -1309,20 +1309,16 @@ var Client = (function (_EventEmitter) {
}*/ }*/
if (data.owner_id === self.user.id) { var keepCheck = setInterval(function () {
var keepCheck = setInterval(function () { if (self.serverCreateListener[data.id]) {
if (self.serverCreateListener[data.id]) { var cbs = self.serverCreateListener[data.id];
var cbs = self.serverCreateListener[data.id]; cbs[0](server); //promise then callback
cbs[0](server); //promise then callback cbs[1](null, server); //legacy callback
cbs[1](null, server); //legacy callback self.serverCreateListener[data.id] = null;
self.serverCreateListener[data.id] = null; self.emit("serverCreate", server);
self.emit("serverCreate", server); clearInterval(keepCheck);
clearInterval(keepCheck); }
} }, 50);
}, 50);
} else {
self.emit("serverCreate", server);
}
break; break;

View File

@@ -1337,20 +1337,16 @@ class Client extends EventEmitter {
}*/ }*/
if(data.owner_id === self.user.id){ var keepCheck = setInterval(() => {
var keepCheck = setInterval(() => { if (self.serverCreateListener[data.id]) {
if (self.serverCreateListener[data.id]) { var cbs = self.serverCreateListener[data.id];
var cbs = self.serverCreateListener[data.id]; cbs[0](server); //promise then callback
cbs[0](server); //promise then callback cbs[1](null, server); //legacy callback
cbs[1](null, server); //legacy callback self.serverCreateListener[data.id] = null;
self.serverCreateListener[data.id] = null; self.emit("serverCreate", server);
self.emit("serverCreate", server); clearInterval(keepCheck);
clearInterval(keepCheck); }
} }, 50);
}, 50);
}else{
self.emit("serverCreate", server);
}
break; break;