Merge branch 'master' into ai-play

data/i18n.json

@@ -37,6 +37,7 @@
     "recover_fail": "Recover failed.",
     "blank_room_name": "Blank room name is unallowed, please fill in something.",
     "loading_user_info": "Loading user info...",
+    "load_user_info_fail": "Failed loading your user info.",
     "invalid_password_length": "Password invalid (Invalid Length)",
     "invalid_password_payload": "Password invalid (Invalid Payload Length)",
     "invalid_password_unauthorized": "Password invalid (Unauthorized)",
@@ -390,6 +391,7 @@
     "recover_fail": "复盘失败。",
     "blank_room_name": "房间名不能为空，请在主机密码处填写房间名",
     "loading_user_info": "正在读取用户信息...",
+    "load_user_info_fail": "读取用户信息失败。",
     "invalid_password_length": "主机密码不正确 (Invalid Length)",
     "invalid_password_payload": "主机密码不正确 (Invalid Payload Length)",
     "invalid_password_unauthorized": "主机密码不正确 (Unauthorized)",

ygopro-server.coffee

@@ -2308,6 +2308,8 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
 
       if !room
         ygopro.stoc_die(client, "${server_full}")
+      else if room.error
+        ygopro.stoc_die(client, room.error)
       else 
         room.join_player(client)
       return
@@ -2373,8 +2375,8 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
             if check_buffer_indentity(decrypted_buffer)
               buffer = decrypted_buffer
           else
-            log.warn("READ USER FAIL", error, body)
-            done("${create_room_failed}")
+            log.warn("READ USER FAIL", client.name, error, body)
+            done("${load_user_info_fail}")
             return
 
           # buffer != decrypted_buffer  ==> auth failed
@@ -2467,6 +2469,8 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
           room.welcome = "${challonge_match_created}"
         if !room
           ygopro.stoc_die(client, "${server_full}")
+        else if room.error
+          ygopro.stoc_die(client, room.error)
         else
           room.join_player(client)
         return
@@ -2515,6 +2519,8 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
     room = await ROOM_find_or_create_by_name(info.pass, client.ip)
     if !room
       ygopro.stoc_die(client, "${server_full}")
+    else if room.error
+      ygopro.stoc_die(client, room.error)
     else
       room.join_player(client)
   await return

ygopro-server.js

@@ -3072,6 +3072,8 @@
         }
         if (!room) {
           ygopro.stoc_die(client, "${server_full}");
+        } else if (room.error) {
+          ygopro.stoc_die(client, room.error);
         } else {
           room.join_player(client);
         }
@@ -3154,8 +3156,8 @@
                 buffer = decrypted_buffer;
               }
             } else {
-              log.warn("READ USER FAIL", error, body);
-              done("${create_room_failed}");
+              log.warn("READ USER FAIL", client.name, error, body);
+              done("${load_user_info_fail}");
               return;
             }
             if (!check_buffer_indentity(buffer)) {
@@ -3260,6 +3262,8 @@
           }
           if (!room) {
             ygopro.stoc_die(client, "${server_full}");
+          } else if (room.error) {
+            ygopro.stoc_die(client, room.error);
           } else {
             room.join_player(client);
           }
@@ -3305,6 +3309,8 @@
       room = (await ROOM_find_or_create_by_name(info.pass, client.ip));
       if (!room) {
         ygopro.stoc_die(client, "${server_full}");
+      } else if (room.error) {
+        ygopro.stoc_die(client, room.error);
       } else {
         room.join_player(client);
       }