Merge branch 'mc'

ygopro-server.coffee

@@ -992,10 +992,12 @@ CLIENT_send_replays = (client, room) ->
   return true
 
 SOCKET_flush_data = (sk, datas) ->
+  if !sk or sk.closed
+    return false
   for buffer in datas
     sk.write(buffer)
   datas.splice(0, datas.length)
-  return
+  return true
 
 class Room
   constructor: (name, @hostinfo) ->
@@ -2718,10 +2720,10 @@ ygopro.stoc_follow 'DUEL_END', false, (buffer, info, client, server, datas)->
   return unless room and settings.modules.replay_delay and room.hostinfo.mode == 1
   SOCKET_flush_data(client, datas)
   CLIENT_send_replays(client, room)
-  if !room.replays_sent_to_watchers
+  if !room.replays_sent_to_watchers and (client.pos == 0 or !room.dueling_players[0] or room.dueling_players[0].closed)
     room.replays_sent_to_watchers = true
-    # for player in room.players when player and player.pos > 3
-    #   CLIENT_send_replays(player, room)
+    for player in room.players when player and player.pos > 3
+      CLIENT_send_replays(player, room)
     for player in room.watchers when player
       CLIENT_send_replays(player, room)
 

ygopro-server.js

@@ -1294,11 +1294,15 @@
 
   SOCKET_flush_data = function(sk, datas) {
     var buffer, len2, m;
+    if (!sk || sk.closed) {
+      return false;
+    }
     for (m = 0, len2 = datas.length; m < len2; m++) {
       buffer = datas[m];
       sk.write(buffer);
     }
     datas.splice(0, datas.length);
+    return true;
   };
 
   Room = (function() {
@@ -3421,19 +3425,26 @@
   });
 
   ygopro.stoc_follow('DUEL_END', false, function(buffer, info, client, server, datas) {
-    var len2, m, player, ref3, results, room;
+    var len2, len3, m, n, player, ref3, ref4, results, room;
     room = ROOM_all[client.rid];
     if (!(room && settings.modules.replay_delay && room.hostinfo.mode === 1)) {
       return;
     }
     SOCKET_flush_data(client, datas);
     CLIENT_send_replays(client, room);
-    if (!room.replays_sent_to_watchers) {
+    if (!room.replays_sent_to_watchers && (client.pos === 0 || !room.dueling_players[0] || room.dueling_players[0].closed)) {
       room.replays_sent_to_watchers = true;
-      ref3 = room.watchers;
-      results = [];
+      ref3 = room.players;
       for (m = 0, len2 = ref3.length; m < len2; m++) {
         player = ref3[m];
+        if (player && player.pos > 3) {
+          CLIENT_send_replays(player, room);
+        }
+      }
+      ref4 = room.watchers;
+      results = [];
+      for (n = 0, len3 = ref4.length; n < len3; n++) {
+        player = ref4[n];
         if (player) {
           results.push(CLIENT_send_replays(player, room));
         }