no kickdown when any disconnected players

ygopro-server.coffee

@@ -951,6 +951,15 @@ class Room
       return
     return host_player
 
+   is_has_disconnected_player: ->
+    if !settings.modules.reconnect.enabled
+      return false
+    found = false
+    for player in @get_playing_player() when player.closed
+      found = true
+      break
+    return found
+
   add_windbot: (botdata)->
     @windbot = botdata
     request
@@ -2765,17 +2774,17 @@ ygopro.stoc_follow 'REPLAY', true, (buffer, info, client, server)->
 
 if settings.modules.random_duel.enabled
   setInterval ()->
-    for room in ROOM_all when room and room.started and room.random_type and room.last_active_time and room.waiting_for_player
+    for room in ROOM_all when room and room.started and room.random_type and room.last_active_time and room.waiting_for_player and !room.is_has_disconnected_player()
       time_passed = Math.floor((moment() - room.last_active_time) / 1000)
       #log.info time_passed
-      if time_passed >= settings.modules.random_duel.hang_timeout and !room.waiting_for_player.closed
+      if time_passed >= settings.modules.random_duel.hang_timeout
         room.last_active_time = moment()
         ROOM_ban_player(room.waiting_for_player.name, room.waiting_for_player.ip, "${random_ban_reason_AFK}")
         room.scores[room.waiting_for_player.name] = -9
         #log.info room.waiting_for_player.name, room.scores[room.waiting_for_player.name]
         ygopro.stoc_send_chat_to_room(room, "#{room.waiting_for_player.name} ${kicked_by_system}", ygopro.constants.COLORS.RED)
         CLIENT_kick(room.waiting_for_player)
-      else if time_passed >= (settings.modules.random_duel.hang_timeout - 20) and not (time_passed % 10) and !room.waiting_for_player.closed
+      else if time_passed >= (settings.modules.random_duel.hang_timeout - 20) and not (time_passed % 10)
         ygopro.stoc_send_chat_to_room(room, "#{room.waiting_for_player.name} ${afk_warn_part1}#{settings.modules.random_duel.hang_timeout - time_passed}${afk_warn_part2}", ygopro.constants.COLORS.RED)
         ROOM_unwelcome(room, room.waiting_for_player, "${random_ban_reason_AFK}")
     return
@@ -2783,16 +2792,16 @@ if settings.modules.random_duel.enabled
 
 if settings.modules.mycard.enabled
   setInterval ()->
-    for room in ROOM_all when room and room.started and room.arena and room.last_active_time and room.waiting_for_player
+    for room in ROOM_all when room and room.started and room.arena and room.last_active_time and room.waiting_for_player and !room.is_has_disconnected_player()
       time_passed = Math.floor((moment() - room.last_active_time) / 1000)
       #log.info time_passed
-      if time_passed >= settings.modules.random_duel.hang_timeout and !room.waiting_for_player.closed
+      if time_passed >= settings.modules.random_duel.hang_timeout
         room.last_active_time = moment()
         ygopro.stoc_send_chat_to_room(room, "#{room.waiting_for_player.name} ${kicked_by_system}", ygopro.constants.COLORS.RED)
         room.scores[room.waiting_for_player.name] = -9
         #log.info room.waiting_for_player.name, room.scores[room.waiting_for_player.name]
         CLIENT_kick(room.waiting_for_player)
-      else if time_passed >= (settings.modules.random_duel.hang_timeout - 20) and not (time_passed % 10) and !room.waiting_for_player.closed
+      else if time_passed >= (settings.modules.random_duel.hang_timeout - 20) and not (time_passed % 10)
         ygopro.stoc_send_chat_to_room(room, "#{room.waiting_for_player.name} ${afk_warn_part1}#{settings.modules.random_duel.hang_timeout - time_passed}${afk_warn_part2}", ygopro.constants.COLORS.RED)
     return
   , 1000

ygopro-server.js

@@ -1222,6 +1222,24 @@
       return host_player;
     };
 
+    Room.prototype.is_has_disconnected_player = function() {
+      var found, len2, m, player, ref2;
+      if (!settings.modules.reconnect.enabled) {
+        return false;
+      }
+      found = false;
+      ref2 = this.get_playing_player();
+      for (m = 0, len2 = ref2.length; m < len2; m++) {
+        player = ref2[m];
+        if (!player.closed) {
+          continue;
+        }
+        found = true;
+        break;
+      }
+      return found;
+    };
+
     Room.prototype.add_windbot = function(botdata) {
       this.windbot = botdata;
       request({
@@ -3501,17 +3519,17 @@
       var len2, m, room, time_passed;
       for (m = 0, len2 = ROOM_all.length; m < len2; m++) {
         room = ROOM_all[m];
-        if (!(room && room.started && room.random_type && room.last_active_time && room.waiting_for_player)) {
+        if (!(room && room.started && room.random_type && room.last_active_time && room.waiting_for_player && !room.is_has_disconnected_player())) {
           continue;
         }
         time_passed = Math.floor((moment() - room.last_active_time) / 1000);
-        if (time_passed >= settings.modules.random_duel.hang_timeout && !room.waiting_for_player.closed) {
+        if (time_passed >= settings.modules.random_duel.hang_timeout) {
           room.last_active_time = moment();
           ROOM_ban_player(room.waiting_for_player.name, room.waiting_for_player.ip, "${random_ban_reason_AFK}");
           room.scores[room.waiting_for_player.name] = -9;
           ygopro.stoc_send_chat_to_room(room, room.waiting_for_player.name + " ${kicked_by_system}", ygopro.constants.COLORS.RED);
           CLIENT_kick(room.waiting_for_player);
-        } else if (time_passed >= (settings.modules.random_duel.hang_timeout - 20) && !(time_passed % 10) && !room.waiting_for_player.closed) {
+        } else if (time_passed >= (settings.modules.random_duel.hang_timeout - 20) && !(time_passed % 10)) {
           ygopro.stoc_send_chat_to_room(room, room.waiting_for_player.name + " ${afk_warn_part1}" + (settings.modules.random_duel.hang_timeout - time_passed) + "${afk_warn_part2}", ygopro.constants.COLORS.RED);
           ROOM_unwelcome(room, room.waiting_for_player, "${random_ban_reason_AFK}");
         }
@@ -3524,16 +3542,16 @@
       var len2, m, room, time_passed;
       for (m = 0, len2 = ROOM_all.length; m < len2; m++) {
         room = ROOM_all[m];
-        if (!(room && room.started && room.arena && room.last_active_time && room.waiting_for_player)) {
+        if (!(room && room.started && room.arena && room.last_active_time && room.waiting_for_player && !room.is_has_disconnected_player())) {
           continue;
         }
         time_passed = Math.floor((moment() - room.last_active_time) / 1000);
-        if (time_passed >= settings.modules.random_duel.hang_timeout && !room.waiting_for_player.closed) {
+        if (time_passed >= settings.modules.random_duel.hang_timeout) {
           room.last_active_time = moment();
           ygopro.stoc_send_chat_to_room(room, room.waiting_for_player.name + " ${kicked_by_system}", ygopro.constants.COLORS.RED);
           room.scores[room.waiting_for_player.name] = -9;
           CLIENT_kick(room.waiting_for_player);
-        } else if (time_passed >= (settings.modules.random_duel.hang_timeout - 20) && !(time_passed % 10) && !room.waiting_for_player.closed) {
+        } else if (time_passed >= (settings.modules.random_duel.hang_timeout - 20) && !(time_passed % 10)) {
           ygopro.stoc_send_chat_to_room(room, room.waiting_for_player.name + " ${afk_warn_part1}" + (settings.modules.random_duel.hang_timeout - time_passed) + "${afk_warn_part2}", ygopro.constants.COLORS.RED);
         }
       }