Merge branch 'master' of https://github.com/purerosefallen/ygopro-server into tcg_random

config_build/config.json

@@ -215,7 +215,8 @@
           "callback": {
             "command": "xbuild",
             "args": [
-              "/property:Configuration=Release"
+              "/property:Configuration=Release",
+              "/property:TargetFrameworkVersion=\"v4.5\""
             ],
             "path": "./windbot/"
           }

config_tourney/config.json

@@ -214,7 +214,8 @@
           "callback": {
             "command": "xbuild",
             "args": [
-              "/property:Configuration=Release"
+              "/property:Configuration=Release",
+              "/property:TargetFrameworkVersion=\"v4.5\""
             ],
             "path": "./windbot/"
           }

docs/install_centos_6.sh

@@ -73,7 +73,7 @@ cd ..
 
 git clone https://github.com/purerosefallen/windbot
 cd windbot
-xbuild /property:Configuration=Release
+xbuild /property:Configuration=Release /property:TargetFrameworkVersion="v4.5"
 ln -s bin/Release/WindBot.exe .
 ln -s ../ygopro/cards.cdb .
 pm2 start pm2.json

docs/install_centos_7.sh

@@ -73,7 +73,7 @@ cd ..
 
 git clone https://github.com/purerosefallen/windbot
 cd windbot
-xbuild /property:Configuration=Release
+xbuild /property:Configuration=Release /property:TargetFrameworkVersion="v4.5"
 ln -s bin/Release/WindBot.exe .
 ln -s ../ygopro/cards.cdb .
 pm2 start pm2.json

docs/install_ubnutu_14.sh

@@ -71,7 +71,7 @@ cd ..
 
 git clone https://github.com/purerosefallen/windbot
 cd windbot
-xbuild /property:Configuration=Release
+xbuild /property:Configuration=Release /property:TargetFrameworkVersion="v4.5"
 ln -s bin/Release/WindBot.exe .
 ln -s ../ygopro/cards.cdb .
 pm2 start pm2.json

docs/install_ubnutu_16.sh

@@ -71,7 +71,7 @@ cd ..
 
 git clone https://github.com/purerosefallen/windbot
 cd windbot
-xbuild /property:Configuration=Release
+xbuild /property:Configuration=Release /property:TargetFrameworkVersion="v4.5"
 ln -s bin/Release/WindBot.exe .
 ln -s ../ygopro/cards.cdb .
 pm2 start pm2.json

docs/install_ubnutu_18.sh

@@ -70,7 +70,7 @@ cd ..
 
 git clone https://github.com/purerosefallen/windbot
 cd windbot
-xbuild /property:Configuration=Release
+xbuild /property:Configuration=Release /property:TargetFrameworkVersion="v4.5"
 ln -s bin/Release/WindBot.exe .
 ln -s ../ygopro/cards.cdb .
 pm2 start pm2.json

docs/update.sh

@@ -7,7 +7,7 @@ git reset --hard FETCH_HEAD
 cd windbot
 git pull origin master
 git reset --hard FETCH_HEAD
-echo y | xbuild /property:Configuration=Release
+echo y | xbuild /property:Configuration=Release /property:TargetFrameworkVersion="v4.5"
 cd ../ygopro
 git pull origin server
 git reset --hard FETCH_HEAD

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];