Skip to content

S
srvpro
Commit fa7ed0ab authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'mc'

parents fcaf3026 299fcffb
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
ygopro-server.coffee
View file @ fa7ed0ab
...@@ -592,6 +592,7 @@ CLIENT_pre_reconnect = (client) -> ...@@ -592,6 +592,7 @@ CLIENT_pre_reconnect = (client) ->
client.pre_deckbuf = dinfo.deckbuf client.pre_deckbuf = dinfo.deckbuf
client.pre_reconnecting = true client.pre_reconnecting = true
client.pos = dinfo.old_client.pos client.pos = dinfo.old_client.pos
client.setTimeout(300000)
CLIENT_send_pre_reconnect_info(client, dinfo.room, dinfo.old_client) CLIENT_send_pre_reconnect_info(client, dinfo.room, dinfo.old_client)
CLIENT_reconnect = (client) -> CLIENT_reconnect = (client) ->
...@@ -610,7 +611,6 @@ CLIENT_reconnect = (client) -> ...@@ -610,7 +611,6 @@ CLIENT_reconnect = (client) ->
current_old_server.destroy() current_old_server.destroy()
client.established = true client.established = true
client.pre_establish_buffers = [] client.pre_establish_buffers = []
client.setTimeout(300000)
CLIENT_import_data(client, dinfo.old_client, dinfo.room) CLIENT_import_data(client, dinfo.old_client, dinfo.room)
CLIENT_send_reconnect_info(client, client.server, dinfo.room) CLIENT_send_reconnect_info(client, client.server, dinfo.room)
CLIENT_reconnect_unregister(client, true) CLIENT_reconnect_unregister(client, true)
......
ygopro-server.js
View file @ fa7ed0ab
...@@ -793,6 +793,7 @@ ...@@ -793,6 +793,7 @@
client.pre_deckbuf = dinfo.deckbuf; client.pre_deckbuf = dinfo.deckbuf;
client.pre_reconnecting = true; client.pre_reconnecting = true;
client.pos = dinfo.old_client.pos; client.pos = dinfo.old_client.pos;
client.setTimeout(300000);
return CLIENT_send_pre_reconnect_info(client, dinfo.room, dinfo.old_client); return CLIENT_send_pre_reconnect_info(client, dinfo.room, dinfo.old_client);
}; };
...@@ -814,7 +815,6 @@ ...@@ -814,7 +815,6 @@
current_old_server.destroy(); current_old_server.destroy();
client.established = true; client.established = true;
client.pre_establish_buffers = []; client.pre_establish_buffers = [];
client.setTimeout(300000);
CLIENT_import_data(client, dinfo.old_client, dinfo.room); CLIENT_import_data(client, dinfo.old_client, dinfo.room);
CLIENT_send_reconnect_info(client, client.server, dinfo.room); CLIENT_send_reconnect_info(client, client.server, dinfo.room);
CLIENT_reconnect_unregister(client, true); CLIENT_reconnect_unregister(client, true);
......
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