Merge branch 'mc'

ygopro-server.coffee

@@ -1069,7 +1069,7 @@ CLIENT_get_partner = (client) ->
     return room.dueling_players[5 - client.pos]
 
 CLIENT_send_replays = (client, room) ->
-  return false unless settings.modules.replay_delay and room.replays.length and room.hostinfo.mode == 1 and !client.replays_sent and !client.closed
+  return false unless settings.modules.replay_delay and not (settings.modules.tournament_mode.enabled and settings.modules.tournament_mode.replay_safe and settings.modules.tournament_mode.block_replay_to_player) and room.replays.length and room.hostinfo.mode == 1 and !client.replays_sent and !client.closed
   client.replays_sent = true
   i = 0
   for buffer in room.replays
@@ -1124,8 +1124,7 @@ class Room
     @death = 0
     @turn = 0
     @duel_stage = ygopro.constants.DUEL_STAGE.BEGIN
-    if settings.modules.replay_delay
-      @replays = []
+    @replays = []
     ROOM_all.push this
 
     if settings.modules.pre_release_compat.enabled
@@ -1364,6 +1363,7 @@ class Room
         userscoreB: score_array[1].score,
         userdeckA: score_array[0].deck,
         userdeckB: score_array[1].deck,
+        replays: @replays,
         start: @start_time,
         end: end_time,
         arena: @arena
@@ -3758,7 +3758,7 @@ ygopro.stoc_follow 'REPLAY', true, (buffer, info, client, server, datas)->
   return settings.modules.tournament_mode.enabled and settings.modules.tournament_mode.replay_safe and settings.modules.tournament_mode.block_replay_to_player or settings.modules.replay_delay unless room
   if settings.modules.cloud_replay.enabled and room.random_type
     Cloud_replay_ids.push room.cloud_replay_id
-  if settings.modules.replay_delay and room.hostinfo.mode == 1 and not (settings.modules.tournament_mode.enabled and settings.modules.tournament_mode.replay_safe and settings.modules.tournament_mode.block_replay_to_player) and !room.replays[room.duel_count - 1]
+  if !room.replays[room.duel_count - 1]
     # console.log("Replay saved: ", room.duel_count - 1, client.pos)
     room.replays[room.duel_count - 1] = buffer
   if settings.modules.tournament_mode.enabled and settings.modules.tournament_mode.replay_safe

ygopro-server.js

@@ -1386,7 +1386,7 @@
 
   CLIENT_send_replays = function(client, room) {
     var buffer, i, len3, m, ref3;
-    if (!(settings.modules.replay_delay && room.replays.length && room.hostinfo.mode === 1 && !client.replays_sent && !client.closed)) {
+    if (!(settings.modules.replay_delay && !(settings.modules.tournament_mode.enabled && settings.modules.tournament_mode.replay_safe && settings.modules.tournament_mode.block_replay_to_player) && room.replays.length && room.hostinfo.mode === 1 && !client.replays_sent && !client.closed)) {
       return false;
     }
     client.replays_sent = true;
@@ -1459,9 +1459,7 @@
       this.death = 0;
       this.turn = 0;
       this.duel_stage = ygopro.constants.DUEL_STAGE.BEGIN;
-      if (settings.modules.replay_delay) {
-        this.replays = [];
-      }
+      this.replays = [];
       ROOM_all.push(this);
       if (settings.modules.pre_release_compat.enabled) {
         list_official_to_pre = {};
@@ -1772,6 +1770,7 @@
             userscoreB: score_array[1].score,
             userdeckA: score_array[0].deck,
             userdeckB: score_array[1].deck,
+            replays: this.replays,
             start: this.start_time,
             end: end_time,
             arena: this.arena
@@ -4861,7 +4860,7 @@
     if (settings.modules.cloud_replay.enabled && room.random_type) {
       Cloud_replay_ids.push(room.cloud_replay_id);
     }
-    if (settings.modules.replay_delay && room.hostinfo.mode === 1 && !(settings.modules.tournament_mode.enabled && settings.modules.tournament_mode.replay_safe && settings.modules.tournament_mode.block_replay_to_player) && !room.replays[room.duel_count - 1]) {
+    if (!room.replays[room.duel_count - 1]) {
       room.replays[room.duel_count - 1] = buffer;
     }
     if (settings.modules.tournament_mode.enabled && settings.modules.tournament_mode.replay_safe) {