Merge branch 'mc'

ygopro-server.coffee

@@ -3505,7 +3505,7 @@ ygopro.ctos_follow 'CHAT', true, (buffer, info, client, server, datas)->
     ygopro.stoc_send_chat(client, "${chat_warn_level0}", ygopro.constants.COLORS.RED)
     cancel = true
   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
+    if !cancel and settings.modules.display_watchers and (client.is_post_watcher or client.pos > 3)
       ygopro.stoc_send_chat_to_room(room, "#{client.name}: #{msg}", 9)
       return true
     return cancel
@@ -3565,7 +3565,7 @@ ygopro.ctos_follow 'CHAT', true, (buffer, info, client, server, datas)->
   if client.abuse_count>=5
     ygopro.stoc_send_chat_to_room(room, "#{client.name} ${chat_banned}", ygopro.constants.COLORS.RED)
     await ROOM_ban_player(client.name, client.ip, "${random_ban_reason_abuse}")
-  if !cancel and settings.modules.display_watchers and client.is_post_watcher
+  if !cancel and settings.modules.display_watchers and (client.is_post_watcher or client.pos > 3)
     ygopro.stoc_send_chat_to_room(room, "#{client.name}: #{msg}", 9)
     return true
   await return cancel

ygopro-server.js

@@ -4686,7 +4686,7 @@
       cancel = true;
     }
     if (!(room && (room.random_type || room.arena)) && !settings.modules.mycard.enabled) {
-      if (!cancel && settings.modules.display_watchers && client.is_post_watcher) {
+      if (!cancel && settings.modules.display_watchers && (client.is_post_watcher || client.pos > 3)) {
         ygopro.stoc_send_chat_to_room(room, `${client.name}: ${msg}`, 9);
         return true;
       }
@@ -4755,7 +4755,7 @@
       ygopro.stoc_send_chat_to_room(room, `${client.name} \${chat_banned}`, ygopro.constants.COLORS.RED);
       await ROOM_ban_player(client.name, client.ip, "${random_ban_reason_abuse}");
     }
-    if (!cancel && settings.modules.display_watchers && client.is_post_watcher) {
+    if (!cancel && settings.modules.display_watchers && (client.is_post_watcher || client.pos > 3)) {
       ygopro.stoc_send_chat_to_room(room, `${client.name}: ${msg}`, 9);
       return true;
     }