Merge branch 'master' into tcg_random

ygopro-server.coffee

@@ -597,10 +597,10 @@ init = () ->
       try
         await axios.post(settings.modules.random_duel.post_match_scores, {
           headers: { 'content-type': 'application/x-www-form-urlencoded' },
+          responseType: "json",
           data: qs.stringify({
             accesskey: settings.modules.random_duel.post_match_accesskey,
             rank: JSON.stringify(scores)
-            responseType: "json"
           })
         })
       catch e
@@ -2281,8 +2281,8 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
               return
             room.private = true
             room.arena = settings.modules.arena_mode.mode
-            if room.arena == "athletic"
             room.max_player = 2
+            if room.arena == "athletic"
               room.welcome = "${athletic_arena_tip}"
         when 5
           title = info.pass.slice(8).replace(String.fromCharCode(0xFEFF), ' ')

ygopro-server.js

@@ -760,10 +760,10 @@
             headers: {
               'content-type': 'application/x-www-form-urlencoded'
             },
+            responseType: "json",
             data: qs.stringify({
               accesskey: settings.modules.random_duel.post_match_accesskey,
-              rank: JSON.stringify(scores),
-              responseType: "json"
+              rank: JSON.stringify(scores)
             })
           });
         } catch (error1) {
@@ -3020,8 +3020,8 @@
               }
               room.private = true;
               room.arena = settings.modules.arena_mode.mode;
-              if (room.arena === "athletic") {
               room.max_player = 2;
+              if (room.arena === "athletic") {
                 room.welcome = "${athletic_arena_tip}";
               }
             }