From b2bed8941e863d054fc04dbeb3989b45c2229c8a Mon Sep 17 00:00:00 2001
From: sindoring <sindoringg@gmail.com>
Date: Mon, 9 Mar 2026 13:17:21 +0400
Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=B4=D0=BB=D1=8F?=
 =?UTF-8?q?=20playerbots?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.example                                     | 13 +++++++++++++
 docker-compose.override.yml                      |  2 ++
 modules/mod-playerbots/conf/playerbots.conf.dist |  8 ++++----
 setup-modules.sh                                 | 10 ++++++++++
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/.env.example b/.env.example
index ab24b6f..5e19129 100644
--- a/.env.example
+++ b/.env.example
@@ -124,6 +124,10 @@ ACORE_PLAYERBOTS_FORCE=0
 # worldserver.conf: управляемые override-настройки
 # ------------------------------------------------------------------------------
 
+# В контейнерном режиме консоль worldserver лучше отключать.
+# Иначе при EOF на stdin сервер может сам завершиться и контейнер начнет перезапускаться.
+ACORE_WORLD_CONSOLE_ENABLE=0
+
 # Включает PlayerSettings, необходимые для mod-individual-progression.
 ACORE_WORLD_ENABLE_PLAYER_SETTINGS=1
 
@@ -399,3 +403,12 @@ ACORE_PLAYERBOTS_RANDOM_BOT_JOIN_LFG=0
 
 # Читы, которые выдаются ботам.
 ACORE_PLAYERBOTS_BOT_CHEATS=food,taxi,raid
+
+# Количество arena teams для random bots.
+# Для PvE-сервера лучше оставить 0.
+ACORE_PLAYERBOTS_RANDOM_BOT_ARENA_TEAM_2V2_COUNT=0
+ACORE_PLAYERBOTS_RANDOM_BOT_ARENA_TEAM_3V3_COUNT=0
+ACORE_PLAYERBOTS_RANDOM_BOT_ARENA_TEAM_5V5_COUNT=0
+
+# Разовая очистка random-bot arena teams перед следующим стартом.
+ACORE_PLAYERBOTS_DELETE_RANDOM_BOT_ARENA_TEAMS=0
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 3367ecd..66f4271 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -1,5 +1,7 @@
 services:
   ac-worldserver:
+    stdin_open: false
+    tty: false
     environment:
       AC_RATE_XP_KILL: "${AC_RATE_XP_KILL:-1}"
       AC_AI_PLAYERBOT_RANDOM_BOT_AUTOLOGIN: "${AC_AI_PLAYERBOT_RANDOM_BOT_AUTOLOGIN:-1}"
diff --git a/modules/mod-playerbots/conf/playerbots.conf.dist b/modules/mod-playerbots/conf/playerbots.conf.dist
index a2f0688..241b9b4 100644
--- a/modules/mod-playerbots/conf/playerbots.conf.dist
+++ b/modules/mod-playerbots/conf/playerbots.conf.dist
@@ -1207,9 +1207,9 @@ AiPlayerbot.RandomBotAutoJoinBGRatedArena5v5Count = 0
 # Warning: Reinitializing bots completely resets them (command in game: .playerbots rndbot init)
 # Bots only join one arena team to avoid queueing issues. Take that into account when increasing count.
 # Default: 2v2: 10 (20 Bots), 3v3: 10 (30 bots), 5v5: 5 (25 bots)
-AiPlayerbot.RandomBotArenaTeam2v2Count = 10
-AiPlayerbot.RandomBotArenaTeam3v3Count = 10
-AiPlayerbot.RandomBotArenaTeam5v5Count = 5
+AiPlayerbot.RandomBotArenaTeam2v2Count = 0
+AiPlayerbot.RandomBotArenaTeam3v3Count = 0
+AiPlayerbot.RandomBotArenaTeam5v5Count = 0
 
 # Arena rating is randomized on team creation.
 # Default: Max: 2000, Min: 1000
@@ -2182,4 +2182,4 @@ AiPlayerbot.SummonAtInnkeepersEnabled = 1
 # 30% more damage, 40% damage reduction (tank bots), increased all resistances, reduced threat for non tank bots, increased threat for tank bots.
 # Buffs will be applied on PP, Sindragosa and Lich King
 
-AiPlayerbot.EnableICCBuffs = 1
\ No newline at end of file
+AiPlayerbot.EnableICCBuffs = 1
diff --git a/setup-modules.sh b/setup-modules.sh
index 810abef..2fa08bc 100644
--- a/setup-modules.sh
+++ b/setup-modules.sh
@@ -19,6 +19,7 @@ DRY_RUN=0
 FORCE_PLAYERBOTS="${FORCE_PLAYERBOTS:-${ACORE_PLAYERBOTS_FORCE:-0}}"
 
 : "${ACORE_WORLD_ENABLE_PLAYER_SETTINGS:=1}"
+: "${ACORE_WORLD_CONSOLE_ENABLE:=0}"
 : "${ACORE_WORLD_DBC_ENFORCE_ITEM_ATTRIBUTES:=0}"
 : "${ACORE_WORLD_INSTANCE_IGNORE_RAID:=1}"
 : "${ACORE_WORLD_RATE_CREATURE_ELITE_ELITE_DAMAGE:=0.80}"
@@ -106,6 +107,10 @@ FORCE_PLAYERBOTS="${FORCE_PLAYERBOTS:-${ACORE_PLAYERBOTS_FORCE:-0}}"
 : "${ACORE_PLAYERBOTS_RANDOM_BOT_INVITE_PLAYER:=0}"
 : "${ACORE_PLAYERBOTS_RANDOM_BOT_JOIN_LFG:=0}"
 : "${ACORE_PLAYERBOTS_BOT_CHEATS:=food,taxi,raid}"
+: "${ACORE_PLAYERBOTS_RANDOM_BOT_ARENA_TEAM_2V2_COUNT:=0}"
+: "${ACORE_PLAYERBOTS_RANDOM_BOT_ARENA_TEAM_3V3_COUNT:=0}"
+: "${ACORE_PLAYERBOTS_RANDOM_BOT_ARENA_TEAM_5V5_COUNT:=0}"
+: "${ACORE_PLAYERBOTS_DELETE_RANDOM_BOT_ARENA_TEAMS:=0}"
 
 usage() {
     cat <<EOF
@@ -408,6 +413,10 @@ AiPlayerbot.SyncLevelWithPlayers = ${ACORE_PLAYERBOTS_SYNC_LEVEL_WITH_PLAYERS}
 AiPlayerbot.ApplyInstanceStrategies = ${ACORE_PLAYERBOTS_APPLY_INSTANCE_STRATEGIES}
 AiPlayerbot.RandomBotInvitePlayer = ${ACORE_PLAYERBOTS_RANDOM_BOT_INVITE_PLAYER}
 AiPlayerbot.RandomBotJoinLfg = ${ACORE_PLAYERBOTS_RANDOM_BOT_JOIN_LFG}
+AiPlayerbot.RandomBotArenaTeam2v2Count = ${ACORE_PLAYERBOTS_RANDOM_BOT_ARENA_TEAM_2V2_COUNT}
+AiPlayerbot.RandomBotArenaTeam3v3Count = ${ACORE_PLAYERBOTS_RANDOM_BOT_ARENA_TEAM_3V3_COUNT}
+AiPlayerbot.RandomBotArenaTeam5v5Count = ${ACORE_PLAYERBOTS_RANDOM_BOT_ARENA_TEAM_5V5_COUNT}
+AiPlayerbot.DeleteRandomBotArenaTeams = ${ACORE_PLAYERBOTS_DELETE_RANDOM_BOT_ARENA_TEAMS}
 AiPlayerbot.BotCheats = "${ACORE_PLAYERBOTS_BOT_CHEATS}"
 EOF
 }
@@ -415,6 +424,7 @@ EOF
 configure_worldserver() {
     ensure_world_conf
 
+    set_config_value "$WORLD_CONF" "Console.Enable" "$ACORE_WORLD_CONSOLE_ENABLE"
     set_config_value "$WORLD_CONF" "EnablePlayerSettings" "$ACORE_WORLD_ENABLE_PLAYER_SETTINGS"
     set_config_value "$WORLD_CONF" "DBC.EnforceItemAttributes" "$ACORE_WORLD_DBC_ENFORCE_ITEM_ATTRIBUTES"
     set_config_value "$WORLD_CONF" "Instance.IgnoreRaid" "$ACORE_WORLD_INSTANCE_IGNORE_RAID"