Merge branch 'mc'

ygopro-server.coffee

@@ -849,7 +849,7 @@ CLIENT_send_reconnect_info = (client, server, room) ->
     client.reconnecting = false
   else if room.selecting_tp
     ygopro.stoc_send(client, 'DUEL_START')
-    if client == room.selecting_tp and !client.selected_preduel
+    if client == room.selecting_tp # and !client.selected_preduel
       ygopro.stoc_send(client, 'SELECT_TP')
     client.reconnecting = false
   else
@@ -3279,7 +3279,7 @@ ygopro.ctos_follow 'TP_RESULT', false, (buffer, info, client, server)->
   room=ROOM_all[client.rid]
   return unless room
   client.selected_preduel = true
-  room.selecting_tp = false
+  # room.selecting_tp = false
   return unless room.random_type or room.arena
   room.last_active_time = moment()
   return

ygopro-server.js

@@ -1121,7 +1121,7 @@
       client.reconnecting = false;
     } else if (room.selecting_tp) {
       ygopro.stoc_send(client, 'DUEL_START');
-      if (client === room.selecting_tp && !client.selected_preduel) {
+      if (client === room.selecting_tp) {
         ygopro.stoc_send(client, 'SELECT_TP');
       }
       client.reconnecting = false;
@@ -4200,7 +4200,6 @@
       return;
     }
     client.selected_preduel = true;
-    room.selecting_tp = false;
     if (!(room.random_type || room.arena)) {
       return;
     }