Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-05-25 01:35:20 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Don't send JSON join message to the main server

Browse Source
This commit is contained in:
Guangcong Luo 2013-05-21 07:05:18 -05:00 committed by Cathy J. Fitzpatrick
parent f2451d949d
commit c00dcc8e23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/client.js
View File

@ -610,13 +610,13 @@
self.trigger('init:socketopened');
// Join the lobby if it fits on the screen.
// Send the join message even if it doesn't, for legacy servers.
self.send((function() {
var msg = {room: 'lobby'};
if ($(window).width() < 916) {
msg.nojoin = 1;
}
return msg;
})(), 'join');
if (Config.server.id !== 'showdown') {
self.send({room: 'lobby', nojoin: 1}, 'join');
}
if ($(window).width() >= 916) {
self.send('/join lobby');
}
var avatar = Tools.prefs('avatar');
if (avatar) {