Merge branch 'master' into tcg_random

config_build/config.json

@@ -98,6 +98,7 @@
     "reconnect": {
       "enabled": true,
       "auto_surrender_after_disconnect": false,
+      "allow_kick_reconnect": true,
       "wait_time": 120000
     },
     "heartbeat_detection": {

config_tourney/config.json

@@ -98,6 +98,7 @@
     "reconnect": {
       "enabled": true,
       "auto_surrender_after_disconnect": false,
+      "allow_kick_reconnect": true,
       "wait_time": 300000
     },
     "heartbeat_detection": {
@@ -279,7 +280,7 @@
       "public_roomlist": true,
       "show_ip": true,
       "show_info": true,
-      "quick_death_rule": 1,
+      "quick_death_rule": 2,
       "ssl": {
         "enabled": false,
         "port": 7923,

ygopro-server.coffee

@@ -675,7 +675,7 @@ CLIENT_is_able_to_reconnect = (client, deckbuf) ->
 
 CLIENT_get_kick_reconnect_target = (client, deckbuf) ->
   for room in ROOM_all when 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 player.ip == client.ip or (settings.modules.vip.enabled and player.vip 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 player.pass == client.pass and (settings.modules.mycard.enabled or settings.modules.tournament_mode.enabled or player.ip == client.ip or (settings.modules.vip.enabled and player.vip and client.vpass == player.vpass)) and (!deckbuf or _.isEqual(player.start_deckbuf, deckbuf))
       return player
   return null
 

ygopro-server.js

@@ -906,7 +906,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 || player.ip === client.ip || (settings.modules.vip.enabled && player.vip && client.vpass === player.vpass)) && (!deckbuf || _.isEqual(player.start_deckbuf, deckbuf))) {
+          if (!player.closed && player.name === client.name && player.pass === client.pass && (settings.modules.mycard.enabled || settings.modules.tournament_mode.enabled || player.ip === client.ip || (settings.modules.vip.enabled && player.vip && client.vpass === player.vpass)) && (!deckbuf || _.isEqual(player.start_deckbuf, deckbuf))) {
             return player;
           }
         }