protect heatbeat after reconnect

ygopro-server.coffee

@@ -656,7 +656,7 @@ CLIENT_heartbeat_unregister = (client) ->
   return true
 
 CLIENT_heartbeat_register = (client, send) ->
-  if !settings.modules.heartbeat_detection.enabled or client.closed or client.is_post_watcher or client.pre_reconnecting or client.reconnecting or client.pos > 3 or client.confirming_cards
+  if !settings.modules.heartbeat_detection.enabled or client.closed or client.is_post_watcher or client.pre_reconnecting or client.reconnecting or client.pos > 3 or client.heartbeat_protected
     return false
   if client.heartbeat_timeout
     CLIENT_heartbeat_unregister(client)
@@ -1896,7 +1896,7 @@ ygopro.stoc_follow 'GAME_MSG', true, (buffer, info, client, server)->
     room.turn = 0
     if settings.modules.heartbeat_detection.enabled
       for player in room.players
-        player.confirming_cards = false
+        player.heartbeat_protected = false
     if room and !room.finished and room.dueling_players[pos]
       room.winner_name = room.dueling_players[pos].name
       #log.info room.dueling_players, pos
@@ -2001,7 +2001,7 @@ ygopro.stoc_follow 'GAME_MSG', true, (buffer, info, client, server)->
         break
     if check
       #console.log("Confirming cards:" + client.name)
-      client.confirming_cards = true
+      client.heartbeat_protected = true
 
   #登场台词
   if settings.modules.dialogues.enabled
@@ -2110,10 +2110,15 @@ ygopro.stoc_follow 'HS_PLAYER_CHANGE', false, (buffer, info, client, server)->
         setTimeout (()-> wait_room_start(ROOM_all[client.rid], 20);return), 1000
   return
 
+ygopro.ctos_follow 'REQUEST_FIELD', true, (buffer, info, client, server)->
+  return true
+
 ygopro.stoc_follow 'FIELD_FINISH', true, (buffer, info, client, server)->
   room=ROOM_all[client.rid]
   return unless room
   client.reconnecting = false
+  if settings.modules.heartbeat_detection.enabled
+    client.heartbeat_protected = true
   if !client.last_game_msg
     return true
   if client.last_game_msg_title != 'WAITING'
@@ -2559,7 +2564,7 @@ ygopro.ctos_follow 'TIME_CONFIRM', false, (buffer, info, client, server)->
   if settings.modules.reconnect.enabled
     client.time_confirm_required = false
   return unless settings.modules.heartbeat_detection.enabled
-  client.confirming_cards = false
+  client.heartbeat_protected = false
   client.heartbeat_responsed = true
   CLIENT_heartbeat_unregister(client)
   return

ygopro-server.js

@@ -841,7 +841,7 @@
   };
 
   CLIENT_heartbeat_register = function(client, send) {
-    if (!settings.modules.heartbeat_detection.enabled || client.closed || client.is_post_watcher || client.pre_reconnecting || client.reconnecting || client.pos > 3 || client.confirming_cards) {
+    if (!settings.modules.heartbeat_detection.enabled || client.closed || client.is_post_watcher || client.pre_reconnecting || client.reconnecting || client.pos > 3 || client.heartbeat_protected) {
       return false;
     }
     if (client.heartbeat_timeout) {
@@ -2287,7 +2287,7 @@
         ref2 = room.players;
         for (m = 0, len2 = ref2.length; m < len2; m++) {
           player = ref2[m];
-          player.confirming_cards = false;
+          player.heartbeat_protected = false;
         }
       }
       if (room && !room.finished && room.dueling_players[pos]) {
@@ -2432,7 +2432,7 @@
         }
       }
       if (check) {
-        client.confirming_cards = true;
+        client.heartbeat_protected = true;
       }
     }
     if (settings.modules.dialogues.enabled) {
@@ -2590,6 +2590,10 @@
     }
   });
 
+  ygopro.ctos_follow('REQUEST_FIELD', true, function(buffer, info, client, server) {
+    return true;
+  });
+
   ygopro.stoc_follow('FIELD_FINISH', true, function(buffer, info, client, server) {
     var room;
     room = ROOM_all[client.rid];
@@ -2597,6 +2601,9 @@
       return;
     }
     client.reconnecting = false;
+    if (settings.modules.heartbeat_detection.enabled) {
+      client.heartbeat_protected = true;
+    }
     if (!client.last_game_msg) {
       return true;
     }
@@ -3212,7 +3219,7 @@
     if (!settings.modules.heartbeat_detection.enabled) {
       return;
     }
-    client.confirming_cards = false;
+    client.heartbeat_protected = false;
     client.heartbeat_responsed = true;
     CLIENT_heartbeat_unregister(client);
   });