Merge branch 'master' into tcg_random

config_tourney/config.json

@@ -119,8 +119,10 @@
     "challonge": {
       "enabled": false,
       "post_detailed_score": true,
-      "api_key": "123",
-      "tournament_id": "456"
+      "post_score_midduel": true,
+      "cache_ttl": 60000,
+      "api_key": "11",
+      "tournament_id": "22"
     },
     "deck_log": {
       "enabled": false,

ygopro-server.coffee

@@ -745,7 +745,7 @@ CLIENT_is_able_to_reconnect = (client, deckbuf) ->
 
 CLIENT_get_kick_reconnect_target = (client, deckbuf) ->
   for room in ROOM_all when room and room.started and !room.windbot
-    for player in room.get_playing_player() when !player.closed and player.name == client.name and player.pass == client.pass and (settings.modules.mycard.enabled or settings.modules.tournament_mode.enabled or player.ip == client.ip or (client.vpass and client.vpass == player.vpass)) and (!deckbuf or _.isEqual(player.start_deckbuf, deckbuf))
+    for player in room.get_playing_player() when !player.closed and player.name == client.name and (settings.modules.challonge.enabled or player.pass == client.pass) and (settings.modules.mycard.enabled or settings.modules.tournament_mode.enabled or player.ip == client.ip or (client.vpass and client.vpass == player.vpass)) and (!deckbuf or _.isEqual(player.start_deckbuf, deckbuf))
       return player
   return null
 

ygopro-server.js

@@ -970,7 +970,7 @@
         ref3 = room.get_playing_player();
         for (n = 0, len3 = ref3.length; n < len3; n++) {
           player = ref3[n];
-          if (!player.closed && player.name === client.name && player.pass === client.pass && (settings.modules.mycard.enabled || settings.modules.tournament_mode.enabled || player.ip === client.ip || (client.vpass && client.vpass === player.vpass)) && (!deckbuf || _.isEqual(player.start_deckbuf, deckbuf))) {
+          if (!player.closed && player.name === client.name && (settings.modules.challonge.enabled || player.pass === client.pass) && (settings.modules.mycard.enabled || settings.modules.tournament_mode.enabled || player.ip === client.ip || (client.vpass && client.vpass === player.vpass)) && (!deckbuf || _.isEqual(player.start_deckbuf, deckbuf))) {
             return player;
           }
         }