Merge branch 'master' into ai-play

data-manager/entities/DuelLogPlayer.js

@@ -57,7 +57,7 @@ let DuelLogPlayer = DuelLogPlayer_1 = class DuelLogPlayer extends BasePlayer_1.B
         p.cardCount = info.cardCount;
         p.isFirst = info.isFirst ? 1 : 0;
         p.winner = info.winner ? 1 : 0;
-        p.startDeckBuffer = info.startDeckBuffer.toString("base64");
+        p.startDeckBuffer = info.startDeckBuffer?.toString("base64") || null;
         p.setCurrentDeck(info.deck);
         return p;
     }

data-manager/entities/DuelLogPlayer.ts

@@ -73,7 +73,7 @@ export class DuelLogPlayer extends BasePlayer {
         p.cardCount = info.cardCount;
         p.isFirst = info.isFirst ? 1 : 0;
         p.winner = info.winner ? 1 : 0;
-        p.startDeckBuffer = info.startDeckBuffer.toString("base64");
+        p.startDeckBuffer = info.startDeckBuffer?.toString("base64") || null;
         p.setCurrentDeck(info.deck);
         return p;
     }

ygopro-server.coffee

@@ -3122,7 +3122,8 @@ ygopro.stoc_follow 'HS_PLAYER_CHANGE', true, (buffer, info, client, server, data
       if room.waiting_for_player != room.waiting_for_player2
         room.waiting_for_player2 = room.waiting_for_player
         room.waiting_for_player_time = settings.modules.arena_mode.ready_time
-        room.waiting_for_player_interval = setInterval (()-> wait_room_start_arena(ROOM_all[client.rid]);return), 1000
+        if !room.waiting_for_player_interval
+          room.waiting_for_player_interval = setInterval (()-> wait_room_start_arena(ROOM_all[client.rid]);return), 1000
       else if !room.waiting_for_player and room.waiting_for_player_interval
         clearInterval room.waiting_for_player_interval
         room.waiting_for_player_interval = null
@@ -3531,7 +3532,7 @@ ygopro.ctos_follow 'CHAT', true, (buffer, info, client, server, datas)->
     client.abuse_count=client.abuse_count+2 if client.abuse_count
     ygopro.stoc_send_chat(client, "${chat_warn_level0}", ygopro.constants.COLORS.RED)
     cancel = true
-  if !(room and (room.random_type or room.arena))
+  if !(room and (room.random_type or room.arena)) and not settings.modules.mycard.enabled
     if !cancel and settings.modules.display_watchers and client.is_post_watcher
       ygopro.stoc_send_chat_to_room(room, "#{client.name}: #{msg}", 9)
       return true

ygopro-server.js

@@ -4116,9 +4116,11 @@
         if (room.waiting_for_player !== room.waiting_for_player2) {
           room.waiting_for_player2 = room.waiting_for_player;
           room.waiting_for_player_time = settings.modules.arena_mode.ready_time;
-          room.waiting_for_player_interval = setInterval((function() {
-            wait_room_start_arena(ROOM_all[client.rid]);
-          }), 1000);
+          if (!room.waiting_for_player_interval) {
+            room.waiting_for_player_interval = setInterval((function() {
+              wait_room_start_arena(ROOM_all[client.rid]);
+            }), 1000);
+          }
         } else if (!room.waiting_for_player && room.waiting_for_player_interval) {
           clearInterval(room.waiting_for_player_interval);
           room.waiting_for_player_interval = null;
@@ -4717,7 +4719,7 @@
       ygopro.stoc_send_chat(client, "${chat_warn_level0}", ygopro.constants.COLORS.RED);
       cancel = true;
     }
-    if (!(room && (room.random_type || room.arena))) {
+    if (!(room && (room.random_type || room.arena)) && !settings.modules.mycard.enabled) {
       if (!cancel && settings.modules.display_watchers && client.is_post_watcher) {
         ygopro.stoc_send_chat_to_room(room, `${client.name}: ${msg}`, 9);
         return true;