Merge branch 'master' into tcg_random

ygopro-server.coffee

@@ -4009,7 +4009,7 @@ ygopro.stoc_follow 'REPLAY', true, (buffer, info, client, server, datas)->
       )
     if settings.modules.cloud_replay.enabled
       ygopro.stoc_send_chat(client, "${cloud_replay_delay_part1}R##{room.cloud_replay_id}${cloud_replay_delay_part2}", ygopro.constants.COLORS.BABYBLUE)
-    return settings.modules.tournament_mode.block_replay_to_player or settings.modules.replay_delay and room.hostinfo.mode == 1
+    return settings.modules.tournament_mode.enabled and settings.modules.tournament_mode.block_replay_to_player or settings.modules.replay_delay and room.hostinfo.mode == 1
   else
     return settings.modules.replay_delay and room.hostinfo.mode == 1
 

ygopro-server.js

@@ -5389,7 +5389,7 @@
       if (settings.modules.cloud_replay.enabled) {
         ygopro.stoc_send_chat(client, `\${cloud_replay_delay_part1}R#${room.cloud_replay_id}\${cloud_replay_delay_part2}`, ygopro.constants.COLORS.BABYBLUE);
       }
-      return settings.modules.tournament_mode.block_replay_to_player || settings.modules.replay_delay && room.hostinfo.mode === 1;
+      return settings.modules.tournament_mode.enabled && settings.modules.tournament_mode.block_replay_to_player || settings.modules.replay_delay && room.hostinfo.mode === 1;
     } else {
       return settings.modules.replay_delay && room.hostinfo.mode === 1;
     }