update challonge

ygopro-server.coffee

@@ -1688,6 +1688,8 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server)->
       challonge.participants._index({
         id: settings.modules.challonge.tournament_id,
         callback: (err, data) ->
+          if client.closed
+            return
           if err or !data
             if err
               log.warn("Failed loading Challonge user info", err)
@@ -1695,7 +1697,7 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server)->
             return
           found = false
           for k,user of data
-            if user.participant and user.participant.name == client.name
+            if user.participant and user.participant.name and _.endsWith(user.participant.name, client.name)
               found = user.participant
               break
           if !found
@@ -1747,7 +1749,7 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server)->
               else if room.no_watch and room.players.length >= (if room.hostinfo.mode == 2 then 4 else 2)
                 ygopro.stoc_die(client, "${watch_denied_room}")
               else
-                for player in room.players when player and player != client and player.name == client.name
+                for player in room.get_playing_player() when player and player != client and player.challonge_info.id == client.challonge_info.id
                   ygopro.stoc_die(client, "${challonge_player_already_in}")
                   return
                 #client.room = room

ygopro-server.js

@@ -2068,6 +2068,9 @@
           id: settings.modules.challonge.tournament_id,
           callback: function(err, data) {
             var found, k, user;
+            if (client.closed) {
+              return;
+            }
             if (err || !data) {
               if (err) {
                 log.warn("Failed loading Challonge user info", err);
@@ -2078,7 +2081,7 @@
             found = false;
             for (k in data) {
               user = data[k];
-              if (user.participant && user.participant.name === client.name) {
+              if (user.participant && user.participant.name && _.endsWith(user.participant.name, client.name)) {
                 found = user.participant;
                 break;
               }
@@ -2142,10 +2145,10 @@
                 } else if (room.no_watch && room.players.length >= (room.hostinfo.mode === 2 ? 4 : 2)) {
                   ygopro.stoc_die(client, "${watch_denied_room}");
                 } else {
-                  ref5 = room.players;
+                  ref5 = room.get_playing_player();
                   for (p = 0, len5 = ref5.length; p < len5; p++) {
                     player = ref5[p];
-                    if (!(player && player !== client && player.name === client.name)) {
+                    if (!(player && player !== client && player.challonge_info.id === client.challonge_info.id)) {
                       continue;
                     }
                     ygopro.stoc_die(client, "${challonge_player_already_in}");