Commit 0633cb3b authored by nanahira's avatar nanahira

Merge branch 'mc'

parents bbc05976 3e233d9a
......@@ -3222,10 +3222,17 @@
room.last_active_time = moment();
});
ygopro.stoc_follow('TIME_LIMIT', false, function(buffer, info, client, server) {
ygopro.stoc_follow('TIME_LIMIT', true, function(buffer, info, client, server) {
var check, cur_players, extend_time, room;
room = ROOM_all[client.rid];
if (!(room && settings.modules.heartbeat_detection.enabled && room.turn && room.turn > 0 && !room.windbot)) {
if (!room) {
return;
}
if (settings.modules.reconnect.enabled && client.closed) {
ygopro.ctos_send(server, 'TIME_CONFIRM');
return true;
}
if (!(settings.modules.heartbeat_detection.enabled && room.turn && room.turn > 0 && !room.windbot)) {
return;
}
check = false;
......@@ -3260,6 +3267,7 @@
extend_time = settings.modules.reconnect.enabled && client.reconnecting;
CLIENT_heartbeat_register(client, false, extend_time);
}
return false;
});
ygopro.ctos_follow('TIME_CONFIRM', false, function(buffer, info, client, server) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment