merge

ygopro-server.coffee

@@ -674,7 +674,7 @@ CLIENT_is_able_to_reconnect = (client, deckbuf) ->
   return true
 
 CLIENT_get_kick_reconnect_target = (client, deckbuf) ->
-  for room in ROOM_all when room.started and !room.windbot
+  for room in ROOM_all when room and room.started and !room.windbot
     for player in room.get_playing_player() when !player.closed and player.name == client.name and player.pass == client.pass and (settings.modules.mycard.enabled or settings.modules.tournament_mode.enabled or player.ip == client.ip or (settings.modules.vip.enabled and player.vip and client.vpass == player.vpass)) and (!deckbuf or _.isEqual(player.start_deckbuf, deckbuf))
       return player
   return null

ygopro-server.js

@@ -902,7 +902,7 @@
     var len2, len3, m, n, player, ref3, room;
     for (m = 0, len2 = ROOM_all.length; m < len2; m++) {
       room = ROOM_all[m];
-      if (room.started && !room.windbot) {
+      if (room && room.started && !room.windbot) {
         ref3 = room.get_playing_player();
         for (n = 0, len3 = ref3.length; n < len3; n++) {
           player = ref3[n];