Revert "Feat: Filter bot logins by level range"

2026-01-13 17:09:08 +00:00 · 2025-10-03 20:20:03 +02:00
37 changed files with 205 additions and 2299 deletions
--- a/.github/workflows/core_build.yml
+++ b/.github/workflows/core_build.yml
@@ -38,7 +38,7 @@ jobs:
      - name: Checkout AzerothCore
        uses: actions/checkout@v3
        with:
-          repository: 'mod-playerbots/azerothcore-wotlk'
+          repository: 'liyunfan1223/azerothcore-wotlk'
          ref: 'Playerbot'

      - name: Set reusable strings
@@ -50,7 +50,7 @@ jobs:
      - name: Checkout Playerbot Module
        uses: actions/checkout@v3
        with:
-          repository: 'mod-playerbots/mod-playerbots'
+          repository: 'liyunfan1223/mod-playerbots'
          path: 'modules/mod-playerbots'
      
      - name: Cache
--- a/.github/workflows/macos_build.yml
+++ b/.github/workflows/macos_build.yml
@@ -22,12 +22,12 @@ jobs:
      - name: Checkout AzerothCore
        uses: actions/checkout@v4
        with:
-          repository: 'mod-playerbots/azerothcore-wotlk'
+          repository: 'liyunfan1223/azerothcore-wotlk'
          ref: 'Playerbot'
      - name: Checkout Playerbot Module
        uses: actions/checkout@v4
        with:
-          repository: 'mod-playerbots/mod-playerbots'
+          repository: 'liyunfan1223/mod-playerbots'
          path: 'modules/mod-playerbots'
      - name: Cache
        uses: actions/cache@v4
--- a/.github/workflows/windows_build.yml
+++ b/.github/workflows/windows_build.yml
@@ -23,12 +23,12 @@ jobs:
      - name: Checkout AzerothCore
        uses: actions/checkout@v3
        with:
-          repository: 'mod-playerbots/azerothcore-wotlk'
+          repository: 'liyunfan1223/azerothcore-wotlk'
          ref: 'Playerbot'
      - name: Checkout Playerbot Module
        uses: actions/checkout@v3
        with:
-          repository: 'mod-playerbots/mod-playerbots'
+          repository: 'liyunfan1223/mod-playerbots'
          path: 'modules/mod-playerbots'
      - name: ccache
        uses: hendrikmuhs/ccache-action@v1.2.13
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <p align="center">
-    <a href="https://github.com/mod-playerbots/mod-playerbots/blob/master/README.md">English</a>
+    <a href="https://github.com/liyunfan1223/mod-playerbots/blob/master/README.md">English</a>
    |
-    <a href="https://github.com/mod-playerbots/mod-playerbots/blob/master/README_CN.md">中文</a>
+    <a href="https://github.com/liyunfan1223/mod-playerbots/blob/master/README_CN.md">中文</a>
    |
    <a href="https://github.com/brighton-chi/mod-playerbots/blob/readme/README_ES.md">Español</a>
 </p>
@@ -12,13 +12,13 @@
 </div>

 <div align="center">
-    <img src="https://github.com/mod-playerbots/mod-playerbots/actions/workflows/macos_build.yml/badge.svg">
-    <img src="https://github.com/mod-playerbots/mod-playerbots/actions/workflows/core_build.yml/badge.svg">
-    <img src="https://github.com/mod-playerbots/mod-playerbots/actions/workflows/windows_build.yml/badge.svg">
+    <img src="https://github.com/liyunfan1223/mod-playerbots/actions/workflows/macos_build.yml/badge.svg">
+    <img src="https://github.com/liyunfan1223/mod-playerbots/actions/workflows/core_build.yml/badge.svg">
+    <img src="https://github.com/liyunfan1223/mod-playerbots/actions/workflows/windows_build.yml/badge.svg">
 </div>

 # Playerbots Module
-`mod-playerbots` is an [AzerothCore](https://www.azerothcore.org/) module that adds player-like bots to a server. The project is based off [IKE3's Playerbots](https://github.com/ike3/mangosbot) and requires a custom branch of AzerothCore to compile and run: [mod-playerbots/azerothcore-wotlk/tree/Playerbot](https://github.com/mod-playerbots/azerothcore-wotlk/tree/Playerbot).
+`mod-playerbots` is an [AzerothCore](https://www.azerothcore.org/) module that adds player-like bots to a server. The project is based off [IKE3's Playerbots](https://github.com/ike3/mangosbot) and requires a custom branch of AzerothCore to compile and run: [liyunfan1223/azerothcore-wotlk/tree/Playerbot](https://github.com/liyunfan1223/azerothcore-wotlk/tree/Playerbot).

 Features include:

@@ -28,7 +28,7 @@ Features include:
 - Highly configurable settings to define how bots behave;
 - Excellent performance, even when running thousands of bots.

-**This project is still under development**. If you encounter any errors or experience crashes, we kindly request that you [report them as GitHub issues](https://github.com/mod-playerbots/mod-playerbots/issues/new?template=bug_report.md). Your valuable feedback will help us improve this project collaboratively.
+**This project is still under development**. If you encounter any errors or experience crashes, we kindly request that you [report them as GitHub issues](https://github.com/liyunfan1223/mod-playerbots/issues/new?template=bug_report.md). Your valuable feedback will help us improve this project collaboratively.

 `mod-playerbots` has a **[Discord server](https://discord.gg/NQm5QShwf9)** where you can discuss the project, ask questions, and get involved in the community!

@@ -36,12 +36,12 @@ Features include:

 ### Classic Installation

-As noted above, `mod-playerbots` requires a custom branch of AzerothCore: [mod-playerbots/azerothcore-wotlk/tree/Playerbot](https://github.com/mod-playerbots/azerothcore-wotlk/tree/Playerbot). To install the module, simply run:
+As noted above, `mod-playerbots` requires a custom branch of AzerothCore: [liyunfan1223/azerothcore-wotlk/tree/Playerbot](https://github.com/liyunfan1223/azerothcore-wotlk/tree/Playerbot). To install the module, simply run:

 ```bash
-git clone https://github.com/mod-playerbots/azerothcore-wotlk.git --branch=Playerbot
+git clone https://github.com/liyunfan1223/azerothcore-wotlk.git --branch=Playerbot
 cd azerothcore-wotlk/modules
-git clone https://github.com/mod-playerbots/mod-playerbots.git --branch=master
+git clone https://github.com/liyunfan1223/mod-playerbots.git --branch=master
 ```

 For more information, refer to the [AzerothCore Installation Guide](https://www.azerothcore.org/wiki/installation) and [Installing a Module](https://www.azerothcore.org/wiki/installing-a-module) pages.
@@ -51,9 +51,9 @@ For more information, refer to the [AzerothCore Installation Guide](https://www.
 **Docker installation is considered experimental.** To install the module on a Docker installation, run:

 ```bash
-git clone https://github.com/mod-playerbots/azerothcore-wotlk.git --branch=Playerbot
+git clone https://github.com/liyunfan1223/azerothcore-wotlk.git --branch=Playerbot
 cd azerothcore-wotlk/modules
-git clone https://github.com/mod-playerbots/mod-playerbots.git --branch=master
+git clone https://github.com/liyunfan1223/mod-playerbots.git --branch=master
 ```

 Afterwards, create a `docker-compose.override.yml` file in the `azerothcore-wotlk` directory. This override file allows for mounting the modules directory to the `ac-worldserver` service which is required for it to run. Put the following inside and save:
@@ -77,24 +77,21 @@ services:
      - ./modules:/azerothcore/modules:ro
 ```

-For example, to double the experience gain rate per kill, take the setting `Rate.XP.Kill = 1` from [woldserver.conf](https://github.com/mod-playerbots/azerothcore-wotlk/blob/Playerbot/src/server/apps/worldserver/worldserver.conf.dist), convert it to an environment variable, and change it to the desired setting in the override file to get `AC_RATE_XP_KILL: "2"`. If you wanted to disable random bots from logging in automatically, take the `AiPlayerbot.RandomBotAutologin = 1` setting from [playerbots.conf](https://github.com/mod-playerbots/mod-playerbots/blob/master/conf/playerbots.conf.dist) and do the same to get `AC_AI_PLAYERBOT_RANDOM_BOT_AUTOLOGIN: "0"`. For more information on how to configure Azerothcore, Playerbots, and other module settings as environment variables in Docker Compose, see the "Configuring AzerothCore in Containers" section in the [Install With Docker](https://www.azerothcore.org/wiki/install-with-docker) guide.
+For example, to double the experience gain rate per kill, take the setting `Rate.XP.Kill = 1` from [woldserver.conf](https://github.com/liyunfan1223/azerothcore-wotlk/blob/Playerbot/src/server/apps/worldserver/worldserver.conf.dist), convert it to an environment variable, and change it to the desired setting in the override file to get `AC_RATE_XP_KILL: "2"`. If you wanted to disable random bots from logging in automatically, take the `AiPlayerbot.RandomBotAutologin = 1` setting from [playerbots.conf](https://github.com/liyunfan1223/mod-playerbots/blob/master/conf/playerbots.conf.dist) and do the same to get `AC_AI_PLAYERBOT_RANDOM_BOT_AUTOLOGIN: "0"`. For more information on how to configure Azerothcore, Playerbots, and other module settings as environment variables in Docker Compose, see the "Configuring AzerothCore in Containers" section in the [Install With Docker](https://www.azerothcore.org/wiki/install-with-docker) guide.

-Before building, consider setting the database password. One way to do this is to create a `.env` file in the root `azerothcore-wotlk` directory using the [template](https://github.com/mod-playerbots/azerothcore-wotlk/blob/Playerbot/conf/dist/env.docker). This file also allows you to set the user and group Docker uses for the services in case you run into any permissions issues, which are the most common cause for Docker installation problems.
+Before building, consider setting the database password. One way to do this is to create a `.env` file in the root `azerothcore-wotlk` directory using the [template](https://github.com/liyunfan1223/azerothcore-wotlk/blob/Playerbot/conf/dist/env.docker). This file also allows you to set the user and group Docker uses for the services in case you run into any permissions issues, which are the most common cause for Docker installation problems.

 Use `docker compose up -d --build` to build and run the server. For more information, including how to create an account and taking backups, refer to the [Install With Docker](https://www.azerothcore.org/wiki/install-with-docker) page.

 ## Documentation

-The [Playerbots Wiki](https://github.com/mod-playerbots/mod-playerbots/wiki) contains an extensive overview of addons, commands, raids with programmed bot strategies, and recommended performance configurations. Please note that documentation may be incomplete or out-of-date in some sections. Contributions are welcome.
+The [Playerbots Wiki](https://github.com/liyunfan1223/mod-playerbots/wiki) contains an extensive overview of addons, commands, raids with programmed bot strategies, and recommended performance configurations. Please note that documentation may be incomplete or out-of-date in some sections. Contributions are welcome.

 ## Frequently Asked Questions

 - **Why aren't my bots casting spells?** Please make sure that the necessary English DBC file (enUS) is present.
 - **What platforms are supported?** We support Ubuntu, Windows, and macOS. Other Linux distros may work, but will not receive support.
- **Why isn't my source compiling?** Please ensure that you are compiling with the required [custom branch of AzerothCore](https://github.com/mod-playerbots/azerothcore-wotlk/tree/Playerbot). Additionally, please [check the build status of our CI](https://github.com/mod-playerbots/mod-playerbots/actions). If the latest build is failing, rever to the last successful commit until we address the issue.
-
-## Code standards
- https://www.azerothcore.org/wiki/cpp-code-standards
+- **Why isn't my source compiling?** Please ensure that you are compiling with the required [custom branch of AzerothCore](https://github.com/liyunfan1223/azerothcore-wotlk/tree/Playerbot). Additionally, please [check the build status of our CI](https://github.com/liyunfan1223/mod-playerbots/actions). If the latest build is failing, rever to the last successful commit until we address the issue.

 ## Addons

@@ -110,6 +107,6 @@ Typically, bots are controlled via chat commands. For larger bot groups, this ca

 Also, a thank you to the many contributors who've helped build this project:

-<a href="https://github.com/mod-playerbots/mod-playerbots/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=mod-playerbots/mod-playerbots" />
+<a href="https://github.com/liyunfan1223/mod-playerbots/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=liyunfan1223/mod-playerbots" />
 </a>
--- a/README_CN.md
+++ b/README_CN.md
@@ -8,16 +8,16 @@

 ## 安装

-请注意，此模块需要对AzerothCore进行特定的自定义更改。为了确保兼容性，您必须使用我fork的自定义分支来编译它，可以在这里找到：[mod-playerbots/azerothcore-wotlk/tree/Playerbot](https://github.com/mod-playerbots/azerothcore-wotlk/tree/Playerbot)。
+请注意，此模块需要对AzerothCore进行特定的自定义更改。为了确保兼容性，您必须使用我fork的自定义分支来编译它，可以在这里找到：[liyunfan1223/azerothcore-wotlk/tree/Playerbot](https://github.com/liyunfan1223/azerothcore-wotlk/tree/Playerbot)。

 要安装此模块，请参考AzerothCore Wiki的详细说明：[AzerothCore安装指南](https://www.azerothcore.org/wiki/installation)。

 我们提供了一个简单的方法来克隆该模块：

 ```bash
-git clone https://github.com/mod-playerbots/azerothcore-wotlk.git --branch=Playerbot
+git clone https://github.com/liyunfan1223/azerothcore-wotlk.git --branch=Playerbot
 cd azerothcore-wotlk/modules
-git clone https://github.com/mod-playerbots/mod-playerbots.git --branch=master
+git clone https://github.com/liyunfan1223/mod-playerbots.git --branch=master
 ```

 ## 快速开始与文档
@@ -60,7 +60,7 @@ git clone https://github.com/mod-playerbots/mod-playerbots.git --branch=master

 - 我们支持Ubuntu、Windows和macOS。

- 我们建立了持续集成工作流。您可以在[GitHub Actions](https://github.com/mod-playerbots/mod-playerbots/actions)中查看构建状态。
+- 我们建立了持续集成工作流。您可以在[GitHub Actions](https://github.com/liyunfan1223/mod-playerbots/actions)中查看构建状态。

 - 如果最新的构建状态失败，请恢复到上一个提交。我们将尽快解决此问题。

--- a/conf/playerbots.conf.dist
+++ b/conf/playerbots.conf.dist
@@ -5,7 +5,7 @@
 # Overview
 # "Randombot": randomly generated bots that log in separately from players and populate the world. Depending on settings, randombots may automatically grind, quest, and upgrade equipment and can be invited to groups and given commands.
 # "Altbot": characters created on player accounts, which may be logged in by the player and invited to groups and given commands like randombots. Depending on settings, altbots can be limited to characters on the active player's account or in the active player's guild.
-# Information about commands to control bots and set their strategies can be found on the wiki at https://github.com/mod-playerbots/mod-playerbots/wiki/Playerbot-Commands.
+# Information about commands to control bots and set their strategies can be found on the wiki at https://github.com/liyunfan1223/mod-playerbots/wiki/Playerbot-Commands.

 ####################################################################################################
 # SECTION INDEX
@@ -284,6 +284,9 @@ AiPlayerbot.TwoRoundsGearInit = 0
 #
 #

+# Bots will say information about items when collecting them
+AiPlayerbot.SayWhenCollectingItems = 1
+
 # Bots keep looting when loot system is set to free for all
 # Default: 0 (disabled)
 AiPlayerbot.FreeMethodLoot = 0
@@ -357,15 +360,15 @@ AiPlayerbot.LootDelay = 1000
 #
 #

-# Distances are in yards
 AiPlayerbot.FarDistance = 20.0
-AiPlayerbot.SightDistance = 100.0
+AiPlayerbot.SightDistance = 75.0
 AiPlayerbot.SpellDistance = 28.5
 AiPlayerbot.ShootDistance = 5.0
+AiPlayerbot.ReactDistance = 150.0
+AiPlayerbot.GrindDistance = 75.0
 AiPlayerbot.HealDistance = 38.5
 AiPlayerbot.LootDistance = 15.0
 AiPlayerbot.FleeDistance = 5.0
-AiPlayerbot.AggroDistance = 22
 AiPlayerbot.TooCloseDistance = 5.0
 AiPlayerbot.MeleeDistance = 0.75
 AiPlayerbot.FollowDistance = 1.5
@@ -373,8 +376,7 @@ AiPlayerbot.WhisperDistance = 6000.0
 AiPlayerbot.ContactDistance = 0.45
 AiPlayerbot.AoeRadius = 10
 AiPlayerbot.RpgDistance = 200
-AiPlayerbot.GrindDistance = 75.0
-AiPlayerbot.ReactDistance = 150.0
+AiPlayerbot.AggroDistance = 22

 #
 #
@@ -482,8 +484,7 @@ AiPlayerbot.RPWarningCooldown = 30
 #
 #

-# Enable/Disable maintenance command
-# Learn all available spells and skills, refresh consumables, repair, enchant equipment and socket gems if bot's level is above AiPlayerbot.MinEnchantingBotLevel
+# Enable/Disable maintenance command (learn all available spells and skills, supplement consumables, repair, enchant equipment if bot's level is above AiPlayerbot.MinEnchantingBotLevel)
 # Default: 1 (enabled)
 AiPlayerbot.MaintenanceCommand = 1

@@ -547,7 +548,7 @@ AiPlayerbot.AutoGearScoreLimit = 0
 # "mana" (bots have infinite mana)
 # "power" (bots have infinite energy, rage, and runic power)
 # "taxi" (bots may use all flight paths, though they will not actually learn them)
-# "raid" (bots use cheats implemented into raid strategies (currently only for Ulduar))
+# "raid" (bots use cheats implemented into raid strategies)
 # To use multiple cheats, separate them by commas below (e.g., to enable all, use "gold,health,mana,power,raid,taxi")
 # Default: food, taxi, and raid are enabled
 AiPlayerbot.BotCheats = "food,taxi,raid"
@@ -605,11 +606,9 @@ AiPlayerbot.RandomBotMaxLevel = 80
 AiPlayerbot.SyncLevelWithPlayers = 0

 # Mark many quests ≤ bot level as complete (slows down bot creation)
-# Default: 0 (disabled)
 AiPlayerbot.PreQuests = 0

 # Enable LFG for randombots
-# Default: 1 (enabled)
 AiPlayerbot.RandomBotJoinLfg = 1

 # Enable/Disable periodic online - offline of randombots to mimic the real-world scenario where not all players are online simultaneously
@@ -630,8 +629,7 @@ AiPlayerbot.RandomBotHordeRatio = 50
 AiPlayerbot.DisableDeathKnightLogin = 0

 # Enable simulated expansion limitation for talents and glyphs
-# If enabled, limits talent trees to 5 rows plus the middle talent of the 6th row for bots until level 61 
-# and 7 rows plus the middle talent of the 8th row for bots from level 61 until level 71
+# If enabled, limits talent trees to 5 rows plus the middle talent of the 6th row for bots until level 61 and 7 rows plus the middle talent of the 8th row for bots until level 71
 # Default: 0 (disabled)
 AiPlayerbot.LimitTalentsExpansion = 0

@@ -715,8 +713,8 @@ AiPlayerbot.IncrementalGearInit = 1
 # Default: 60
 AiPlayerbot.MinEnchantingBotLevel = 60

-# Enable expansion limitation for bot enchants and gems
-# If enabled, bots will not use TBC enchants until level 61 or WotLK enchants and gems until level 71
+# Enable expansion limitation for bot enchants
+# If enabled, bots will not use TBC enchants until level 61 or WotLK enchants until level 71
 # Default: 1 (enabled)
 AiPlayerbot.LimitEnchantExpansion = 1

@@ -812,7 +810,7 @@ AiPlayerbot.botActiveAloneSmartScaleWhenMaxLevel = 80
 #

 # Quest that will be completed and rewarded for all randombots
-AiPlayerbot.RandomBotQuestIds = "3802,5505,6502,7761,7848,10277,10285,11492,13188,13189,24499,24511,24710,24712"
+AiPlayerbot.RandomBotQuestIds = "7848,3802,5505,6502,7761,10277,10285,11492,13188,13189,24499,24511,24710,24712"

 # Randombots will group with nearby randombots to do shared quests
 AiPlayerbot.RandomBotGroupNearby = 0
@@ -873,9 +871,9 @@ AiPlayerbot.RandomBotNonCombatStrategies = ""
 AiPlayerbot.CombatStrategies = ""
 AiPlayerbot.NonCombatStrategies = ""

-# Remove "healer dps" strategy on the maps specified below.
-# Default: 1 (enabled)
-AiPlayerbot.HealerDPSMapRestriction = 1
+# Remove "healer dps" strategy on specified maps.
+# Default: 0 (disabled)
+AiPlayerbot.HealerDPSMapRestriction = 0

 # List of Map IDs where "healer dps" strategy will be removed if AiPlayerbot.HealerDPSMapRestriction is enabled
 # Default: (Dungeon and Raid maps) "33,34,36,43,47,48,70,90,109,129,209,229,230,329,349,389,429,1001,1004,1007,269,540,542,543,545,546,547,552,553,554,555,556,557,558,560,585,574,575,576,578,595,599,600,601,602,604,608,619,632,650,658,668,409,469,509,531,532,534,544,548,550,564,565,580,249,533,603,615,616,624,631,649,724"
@@ -1059,8 +1057,7 @@ AiPlayerbot.ZoneBracket.4197 = 79,80
 #
 #

-# Map IDs where bots can be teleported to
-# Defaults: 0 = Eastern Kingdoms, 1 = Kalimdor, 530 = Outland, 571 = Northrend
+# Maps where bots can be teleported to
 AiPlayerbot.RandomBotMaps = 0,1,530,571

 # Probabilty bots teleport to banker (city)
--- a/data/sql/playerbots/updates/2025_10_09_00_ai_playerbot_texts_fix.sql
+++ b/data/sql/playerbots/updates/2025_10_09_00_ai_playerbot_texts_fix.sql
--- a/src/PlayerbotAI.cpp
+++ b/src/PlayerbotAI.cpp
@@ -378,7 +378,10 @@ void PlayerbotAI::UpdateAIGroupMembership()
            PlayerbotAI* leaderAI = GET_PLAYERBOT_AI(leader);
            if (leaderAI && !leaderAI->IsRealPlayer())
            {
-                LeaveOrDisbandGroup();
+                WorldPacket* packet = new WorldPacket(CMSG_GROUP_DISBAND);
+                bot->GetSession()->QueuePacket(packet);
+                // bot->RemoveFromGroup();
+                ResetStrategies();
            }
        }
    }
@@ -402,7 +405,10 @@ void PlayerbotAI::UpdateAIGroupMembership()
        }
        if (!hasRealPlayer)
        {
-            LeaveOrDisbandGroup();
+            WorldPacket* packet = new WorldPacket(CMSG_GROUP_DISBAND);
+            bot->GetSession()->QueuePacket(packet);
+            // bot->RemoveFromGroup();
+            ResetStrategies();
        }
    }
 }
@@ -785,16 +791,6 @@ void PlayerbotAI::Reset(bool full)
    }
 }

-void PlayerbotAI::LeaveOrDisbandGroup()
-{
-    if (!bot || !bot->GetGroup() || IsRealPlayer())
-        return;
-
-    WorldPacket* packet = new WorldPacket(CMSG_GROUP_DISBAND);
-    bot->GetSession()->QueuePacket(packet);
-    ResetStrategies();
-}
-
 bool PlayerbotAI::IsAllowedCommand(std::string const text)
 {
    if (unsecuredCommands.empty())
--- a/src/PlayerbotAI.h
+++ b/src/PlayerbotAI.h
@@ -415,7 +415,6 @@ public:
    void ResetStrategies(bool load = false);
    void ReInitCurrentEngine();
    void Reset(bool full = false);
-    void LeaveOrDisbandGroup();
    static bool IsTank(Player* player, bool bySpec = false);
    static bool IsHeal(Player* player, bool bySpec = false);
    static bool IsDps(Player* player, bool bySpec = false);
@@ -602,7 +601,6 @@ public:
    NewRpgInfo rpgInfo;
    NewRpgStatistic rpgStatistic;
    std::unordered_set<uint32> lowPriorityQuest;
-    time_t bgReleaseAttemptTime = 0;

    // Schedules a callback to run once after <delayMs> milliseconds.
    void AddTimedEvent(std::function<void()> callback, uint32 delayMs);
--- a/src/PlayerbotAIConfig.cpp
+++ b/src/PlayerbotAIConfig.cpp
@@ -57,54 +57,55 @@ void LoadListString(std::string const value, T& list)

 bool PlayerbotAIConfig::Initialize()
 {
-    LOG_INFO("server.loading", "Initializing mod-playerbots, based on AI Playerbots by ike3 and the original Playerbots by blueboy");
+    LOG_INFO("server.loading", "Initializing AI Playerbots by ike3, based on the original Playerbots by blueboy");

    enabled = sConfigMgr->GetOption<bool>("AiPlayerbot.Enabled", true);
    if (!enabled)
    {
-        LOG_INFO("server.loading", "Playerbots Module is disabled in playerbots.conf");
+        LOG_INFO("server.loading", "AI Playerbots is Disabled in aiplayerbot.conf");
        return false;
    }

-    globalCoolDown = sConfigMgr->GetOption<int32>("AiPlayerbot.GlobalCooldown", 500);
+    globalCoolDown = sConfigMgr->GetOption<int32>("AiPlayerbot.GlobalCooldown", 1500);
    maxWaitForMove = sConfigMgr->GetOption<int32>("AiPlayerbot.MaxWaitForMove", 5000);
    disableMoveSplinePath = sConfigMgr->GetOption<int32>("AiPlayerbot.DisableMoveSplinePath", 0);
    maxMovementSearchTime = sConfigMgr->GetOption<int32>("AiPlayerbot.MaxMovementSearchTime", 3);
    expireActionTime = sConfigMgr->GetOption<int32>("AiPlayerbot.ExpireActionTime", 5000);
-    dispelAuraDuration = sConfigMgr->GetOption<int32>("AiPlayerbot.DispelAuraDuration", 700);
+    dispelAuraDuration = sConfigMgr->GetOption<int32>("AiPlayerbot.DispelAuraDuration", 7000);
    reactDelay = sConfigMgr->GetOption<int32>("AiPlayerbot.ReactDelay", 100);
    dynamicReactDelay = sConfigMgr->GetOption<bool>("AiPlayerbot.DynamicReactDelay", true);
    passiveDelay = sConfigMgr->GetOption<int32>("AiPlayerbot.PassiveDelay", 10000);
    repeatDelay = sConfigMgr->GetOption<int32>("AiPlayerbot.RepeatDelay", 2000);
-    errorDelay = sConfigMgr->GetOption<int32>("AiPlayerbot.ErrorDelay", 100);
+    errorDelay = sConfigMgr->GetOption<int32>("AiPlayerbot.ErrorDelay", 5000);
    rpgDelay = sConfigMgr->GetOption<int32>("AiPlayerbot.RpgDelay", 10000);
-    sitDelay = sConfigMgr->GetOption<int32>("AiPlayerbot.SitDelay", 20000);
-    returnDelay = sConfigMgr->GetOption<int32>("AiPlayerbot.ReturnDelay", 2000);
+    sitDelay = sConfigMgr->GetOption<int32>("AiPlayerbot.SitDelay", 30000);
+    returnDelay = sConfigMgr->GetOption<int32>("AiPlayerbot.ReturnDelay", 7000);
    lootDelay = sConfigMgr->GetOption<int32>("AiPlayerbot.LootDelay", 1000);
+    // Buff system
    minBotsForGreaterBuff = sConfigMgr->GetOption<int32>("AiPlayerbot.MinBotsForGreaterBuff", 3);
    rpWarningCooldown     = sConfigMgr->GetOption<int32>("AiPlayerbot.RPWarningCooldown", 30);
    disabledWithoutRealPlayerLoginDelay = sConfigMgr->GetOption<int32>("AiPlayerbot.DisabledWithoutRealPlayerLoginDelay", 30);
    disabledWithoutRealPlayerLogoutDelay = sConfigMgr->GetOption<int32>("AiPlayerbot.DisabledWithoutRealPlayerLogoutDelay", 300);

    farDistance = sConfigMgr->GetOption<float>("AiPlayerbot.FarDistance", 20.0f);
-    sightDistance = sConfigMgr->GetOption<float>("AiPlayerbot.SightDistance", 100.0f);
-    spellDistance = sConfigMgr->GetOption<float>("AiPlayerbot.SpellDistance", 28.5f);
-    shootDistance = sConfigMgr->GetOption<float>("AiPlayerbot.ShootDistance", 5.0f);
-    healDistance = sConfigMgr->GetOption<float>("AiPlayerbot.HealDistance", 38.5f);
+    sightDistance = sConfigMgr->GetOption<float>("AiPlayerbot.SightDistance", 75.0f);
+    spellDistance = sConfigMgr->GetOption<float>("AiPlayerbot.SpellDistance", 25.0f);
+    shootDistance = sConfigMgr->GetOption<float>("AiPlayerbot.ShootDistance", 25.0f);
+    healDistance = sConfigMgr->GetOption<float>("AiPlayerbot.HealDistance", 25.0f);
    lootDistance = sConfigMgr->GetOption<float>("AiPlayerbot.LootDistance", 15.0f);
-    fleeDistance = sConfigMgr->GetOption<float>("AiPlayerbot.FleeDistance", 5.0f);
+    fleeDistance = sConfigMgr->GetOption<float>("AiPlayerbot.FleeDistance", 7.5f);
    aggroDistance = sConfigMgr->GetOption<float>("AiPlayerbot.AggroDistance", 22.0f);
    tooCloseDistance = sConfigMgr->GetOption<float>("AiPlayerbot.TooCloseDistance", 5.0f);
    meleeDistance = sConfigMgr->GetOption<float>("AiPlayerbot.MeleeDistance", 0.75f);
    followDistance = sConfigMgr->GetOption<float>("AiPlayerbot.FollowDistance", 1.5f);
    whisperDistance = sConfigMgr->GetOption<float>("AiPlayerbot.WhisperDistance", 6000.0f);
-    contactDistance = sConfigMgr->GetOption<float>("AiPlayerbot.ContactDistance", 0.45f);
-    aoeRadius = sConfigMgr->GetOption<float>("AiPlayerbot.AoeRadius", 10.0f);
+    contactDistance = sConfigMgr->GetOption<float>("AiPlayerbot.ContactDistance", 0.5f);
+    aoeRadius = sConfigMgr->GetOption<float>("AiPlayerbot.AoeRadius", 5.0f);
    rpgDistance = sConfigMgr->GetOption<float>("AiPlayerbot.RpgDistance", 200.0f);
    grindDistance = sConfigMgr->GetOption<float>("AiPlayerbot.GrindDistance", 75.0f);
    reactDistance = sConfigMgr->GetOption<float>("AiPlayerbot.ReactDistance", 150.0f);

-    criticalHealth = sConfigMgr->GetOption<int32>("AiPlayerbot.CriticalHealth", 25);
+    criticalHealth = sConfigMgr->GetOption<int32>("AiPlayerbot.CriticalHealth", 20);
    lowHealth = sConfigMgr->GetOption<int32>("AiPlayerbot.LowHealth", 45);
    mediumHealth = sConfigMgr->GetOption<int32>("AiPlayerbot.MediumHealth", 65);
    almostFullHealth = sConfigMgr->GetOption<int32>("AiPlayerbot.AlmostFullHealth", 85);
@@ -115,7 +116,7 @@ bool PlayerbotAIConfig::Initialize()
    saveManaThreshold = sConfigMgr->GetOption<int32>("AiPlayerbot.SaveManaThreshold", 60);
    autoAvoidAoe = sConfigMgr->GetOption<bool>("AiPlayerbot.AutoAvoidAoe", true);
    maxAoeAvoidRadius = sConfigMgr->GetOption<float>("AiPlayerbot.MaxAoeAvoidRadius", 15.0f);
-    LoadSet<std::set<uint32>>(sConfigMgr->GetOption<std::string>("AiPlayerbot.AoeAvoidSpellWhitelist", "50759,57491,13810,29946"),
+    LoadSet<std::set<uint32>>(sConfigMgr->GetOption<std::string>("AiPlayerbot.AoeAvoidSpellWhitelist", "50759,57491,13810"),
                              aoeAvoidSpellWhitelist);
    tellWhenAvoidAoe = sConfigMgr->GetOption<bool>("AiPlayerbot.TellWhenAvoidAoe", false);

@@ -128,7 +129,7 @@ bool PlayerbotAIConfig::Initialize()
    randomBotMaxLevelChance = sConfigMgr->GetOption<float>("AiPlayerbot.RandomBotMaxLevelChance", 0.1f);
    randomBotRpgChance = sConfigMgr->GetOption<float>("AiPlayerbot.RandomBotRpgChance", 0.20f);

-    iterationsPerTick = sConfigMgr->GetOption<int32>("AiPlayerbot.IterationsPerTick", 10);
+    iterationsPerTick = sConfigMgr->GetOption<int32>("AiPlayerbot.IterationsPerTick", 100);

    allowAccountBots = sConfigMgr->GetOption<bool>("AiPlayerbot.AllowAccountBots", true);
    allowGuildBots = sConfigMgr->GetOption<bool>("AiPlayerbot.AllowGuildBots", true);
@@ -142,11 +143,11 @@ bool PlayerbotAIConfig::Initialize()
    LoadList<std::vector<uint32>>(randomBotMapsAsString, randomBotMaps);
    probTeleToBankers = sConfigMgr->GetOption<float>("AiPlayerbot.ProbTeleToBankers", 0.25f);
    enableWeightTeleToCityBankers = sConfigMgr->GetOption<bool>("AiPlayerbot.EnableWeightTeleToCityBankers", false);
-    weightTeleToStormwind = sConfigMgr->GetOption<int>("AiPlayerbot.TeleToStormwindWeight", 2);
+    weightTeleToStormwind = sConfigMgr->GetOption<int>("AiPlayerbot.TeleToStormwindWeight", 1);
    weightTeleToIronforge = sConfigMgr->GetOption<int>("AiPlayerbot.TeleToIronforgeWeight", 1);
    weightTeleToDarnassus = sConfigMgr->GetOption<int>("AiPlayerbot.TeleToDarnassusWeight", 1);
    weightTeleToExodar = sConfigMgr->GetOption<int>("AiPlayerbot.TeleToExodarWeight", 1);
-    weightTeleToOrgrimmar = sConfigMgr->GetOption<int>("AiPlayerbot.TeleToOrgrimmarWeight", 2);
+    weightTeleToOrgrimmar = sConfigMgr->GetOption<int>("AiPlayerbot.TeleToOrgrimmarWeight", 1);
    weightTeleToUndercity = sConfigMgr->GetOption<int>("AiPlayerbot.TeleToUndercityWeight", 1);
    weightTeleToThunderBluff = sConfigMgr->GetOption<int>("AiPlayerbot.TeleToThunderBluffWeight", 1);
    weightTeleToSilvermoonCity = sConfigMgr->GetOption<int>("AiPlayerbot.TeleToSilvermoonCityWeight", 1);
@@ -154,7 +155,7 @@ bool PlayerbotAIConfig::Initialize()
    weightTeleToDalaran = sConfigMgr->GetOption<int>("AiPlayerbot.TeleToDalaranWeight", 1);
    LoadList<std::vector<uint32>>(
        sConfigMgr->GetOption<std::string>("AiPlayerbot.RandomBotQuestItems",
-                                           "5175,5176,5177,5178,6948,11000,12382,13704,16309"),
+                                           "6948,5175,5176,5177,5178,16309,12382,13704,11000"),
        randomBotQuestItems);
    LoadList<std::vector<uint32>>(sConfigMgr->GetOption<std::string>("AiPlayerbot.RandomBotSpellIds", "54197"),
                                  randomBotSpellIds);
@@ -169,7 +170,7 @@ bool PlayerbotAIConfig::Initialize()
        pvpProhibitedAreaIds);
    fastReactInBG = sConfigMgr->GetOption<bool>("AiPlayerbot.FastReactInBG", true);
    LoadList<std::vector<uint32>>(
-        sConfigMgr->GetOption<std::string>("AiPlayerbot.RandomBotQuestIds", "3802,5505,6502,7761,7848,10277,10285,11492,13188,13189,24499,24511,24710,24712"),
+        sConfigMgr->GetOption<std::string>("AiPlayerbot.RandomBotQuestIds", "7848,3802,5505,6502,7761,10277,10285,11492,13188,13189,24499,24511,24710,24712"),
        randomBotQuestIds);

    LoadSet<std::set<uint32>>(
@@ -180,8 +181,8 @@ bool PlayerbotAIConfig::Initialize()
        disallowedGameObjects);
    botAutologin = sConfigMgr->GetOption<bool>("AiPlayerbot.BotAutologin", false);
    randomBotAutologin = sConfigMgr->GetOption<bool>("AiPlayerbot.RandomBotAutologin", true);
-    minRandomBots = sConfigMgr->GetOption<int32>("AiPlayerbot.MinRandomBots", 500);
-    maxRandomBots = sConfigMgr->GetOption<int32>("AiPlayerbot.MaxRandomBots", 500);
+    minRandomBots = sConfigMgr->GetOption<int32>("AiPlayerbot.MinRandomBots", 50);
+    maxRandomBots = sConfigMgr->GetOption<int32>("AiPlayerbot.MaxRandomBots", 50);
    randomBotUpdateInterval = sConfigMgr->GetOption<int32>("AiPlayerbot.RandomBotUpdateInterval", 20);
    randomBotCountChangeMinInterval =
        sConfigMgr->GetOption<int32>("AiPlayerbot.RandomBotCountChangeMinInterval", 30 * MINUTE);
@@ -390,8 +391,8 @@ bool PlayerbotAIConfig::Initialize()

    randomBotCombatStrategies = sConfigMgr->GetOption<std::string>("AiPlayerbot.RandomBotCombatStrategies", "");
    randomBotNonCombatStrategies = sConfigMgr->GetOption<std::string>("AiPlayerbot.RandomBotNonCombatStrategies", "");
-    combatStrategies = sConfigMgr->GetOption<std::string>("AiPlayerbot.CombatStrategies", "");
-    nonCombatStrategies = sConfigMgr->GetOption<std::string>("AiPlayerbot.NonCombatStrategies", "");
+    combatStrategies = sConfigMgr->GetOption<std::string>("AiPlayerbot.CombatStrategies", "+custom::say");
+    nonCombatStrategies = sConfigMgr->GetOption<std::string>("AiPlayerbot.NonCombatStrategies", "+custom::say,+return");
    applyInstanceStrategies = sConfigMgr->GetOption<bool>("AiPlayerbot.ApplyInstanceStrategies", true);

    commandPrefix = sConfigMgr->GetOption<std::string>("AiPlayerbot.CommandPrefix", "");
@@ -511,7 +512,7 @@ bool PlayerbotAIConfig::Initialize()
    randomBotGuildSizeMax = sConfigMgr->GetOption<int32>("AiPlayerbot.RandomBotGuildSizeMax", 15);
    deleteRandomBotGuilds = sConfigMgr->GetOption<bool>("AiPlayerbot.DeleteRandomBotGuilds", false);

-    guildTaskEnabled = sConfigMgr->GetOption<bool>("AiPlayerbot.EnableGuildTasks", false);
+    guildTaskEnabled = sConfigMgr->GetOption<bool>("AiPlayerbot.EnableGuildTasks", true);
    minGuildTaskChangeTime = sConfigMgr->GetOption<int32>("AiPlayerbot.MinGuildTaskChangeTime", 3 * 24 * 3600);
    maxGuildTaskChangeTime = sConfigMgr->GetOption<int32>("AiPlayerbot.MaxGuildTaskChangeTime", 4 * 24 * 3600);
    minGuildTaskAdvertisementTime = sConfigMgr->GetOption<int32>("AiPlayerbot.MinGuildTaskAdvertisementTime", 300);
@@ -597,12 +598,12 @@ bool PlayerbotAIConfig::Initialize()
    minEnchantingBotLevel = sConfigMgr->GetOption<int32>("AiPlayerbot.MinEnchantingBotLevel", 60);
    limitEnchantExpansion = sConfigMgr->GetOption<int32>("AiPlayerbot.LimitEnchantExpansion", 1);
    limitGearExpansion = sConfigMgr->GetOption<int32>("AiPlayerbot.LimitGearExpansion", 1);
-    randombotStartingLevel = sConfigMgr->GetOption<int32>("AiPlayerbot.RandombotStartingLevel", 1);
+    randombotStartingLevel = sConfigMgr->GetOption<int32>("AiPlayerbot.RandombotStartingLevel", 5);
    enablePeriodicOnlineOffline = sConfigMgr->GetOption<bool>("AiPlayerbot.EnablePeriodicOnlineOffline", false);
    enableRandomBotTrading = sConfigMgr->GetOption<int32>("AiPlayerbot.EnableRandomBotTrading", 1);
    periodicOnlineOfflineRatio = sConfigMgr->GetOption<float>("AiPlayerbot.PeriodicOnlineOfflineRatio", 2.0);
    gearscorecheck = sConfigMgr->GetOption<bool>("AiPlayerbot.GearScoreCheck", false);
-    randomBotPreQuests = sConfigMgr->GetOption<bool>("AiPlayerbot.PreQuests", false);
+    randomBotPreQuests = sConfigMgr->GetOption<bool>("AiPlayerbot.PreQuests", true);

    // SPP automation
    freeMethodLoot = sConfigMgr->GetOption<bool>("AiPlayerbot.FreeMethodLoot", false);
@@ -635,7 +636,7 @@ bool PlayerbotAIConfig::Initialize()
    RpgStatusProbWeight[RPG_REST] = sConfigMgr->GetOption<int32>("AiPlayerbot.RpgStatusProbWeight.Rest", 5);

    syncLevelWithPlayers = sConfigMgr->GetOption<bool>("AiPlayerbot.SyncLevelWithPlayers", false);
-    randomBotGroupNearby = sConfigMgr->GetOption<bool>("AiPlayerbot.RandomBotGroupNearby", false);
+    randomBotGroupNearby = sConfigMgr->GetOption<bool>("AiPlayerbot.RandomBotGroupNearby", true);

    // arena
    randomBotArenaTeam2v2Count = sConfigMgr->GetOption<int32>("AiPlayerbot.RandomBotArenaTeam2v2Count", 10);
@@ -678,7 +679,7 @@ bool PlayerbotAIConfig::Initialize()
    LoadList<std::vector<uint32>>(sConfigMgr->GetOption<std::string>("AiPlayerbot.ExcludedHunterPetFamilies", ""), excludedHunterPetFamilies);

    LOG_INFO("server.loading", "---------------------------------------");
-    LOG_INFO("server.loading", "       mod-playerbots initialized      ");
+    LOG_INFO("server.loading", "        AI Playerbots initialized       ");
    LOG_INFO("server.loading", "---------------------------------------");

    return true;
--- a/src/PlayerbotMgr.cpp
+++ b/src/PlayerbotMgr.cpp
@@ -227,12 +227,6 @@ void PlayerbotHolder::HandleBotPackets(WorldSession* session)
    {
        OpcodeClient opcode = static_cast<OpcodeClient>(packet->GetOpcode());
        ClientOpcodeHandler const* opHandle = opcodeTable[opcode];
-        if (!opHandle)
-        {
-            LOG_ERROR("playerbots", "Unhandled opcode {} queued for bot session {}. Packet dropped.", static_cast<uint32>(opcode), session->GetAccountId());
-            delete packet;
-            continue;
-        }
        opHandle->Call(session, *packet);
        delete packet;
    }
@@ -520,7 +514,7 @@ void PlayerbotHolder::OnBotLogin(Player* const bot)

        if (!groupValid)
        {
-            botAI->LeaveOrDisbandGroup();
+            bot->RemoveFromGroup();
        }
    }

--- a/src/Playerbots.cpp
+++ b/src/Playerbots.cpp
@@ -87,8 +87,7 @@ public:
        PLAYERHOOK_ON_BEFORE_CRITERIA_PROGRESS,
        PLAYERHOOK_ON_BEFORE_ACHI_COMPLETE,
        PLAYERHOOK_CAN_PLAYER_USE_PRIVATE_CHAT,
-        PLAYERHOOK_ON_GIVE_EXP,
-        PLAYERHOOK_ON_BEFORE_TELEPORT
+        PLAYERHOOK_ON_GIVE_EXP
    }) {}

    void OnPlayerLogin(Player* player) override
@@ -106,7 +105,7 @@ public:
            {
                ChatHandler(player->GetSession()).SendSysMessage(
                    "|cff00ff00This server runs with |cff00ccffmod-playerbots|r "
-                    "|cffcccccchttps://github.com/mod-playerbots/mod-playerbots|r");
+                    "|cffcccccchttps://github.com/liyunfan1223/mod-playerbots|r");
            }

            if (sPlayerbotAIConfig->enabled || sPlayerbotAIConfig->randomBotAutologin)
@@ -122,26 +121,6 @@ public:
        }
    }

-    bool OnPlayerBeforeTeleport(Player* player, uint32 mapid, float /*x*/, float /*y*/, float /*z*/, float /*orientation*/, uint32 /*options*/, Unit* /*target*/) override
-    {
-        // Only apply to bots to prevent affecting real players
-        if (!player || !player->GetSession()->IsBot())
-            return true;
-
-        // If changing maps, proactively clean visibility references to prevent
-        // stale pointers in other players' visibility maps during the teleport.
-        // This fixes a race condition where:
-        // 1. Bot A teleports and its visible objects start getting cleaned up
-        // 2. Bot B is simultaneously updating visibility and tries to access objects in Bot A's old visibility map
-        // 3. Those objects may already be freed, causing a segmentation fault
-        if (player->GetMapId() != mapid && player->IsInWorld())
-        {
-            player->GetObjectVisibilityContainer().CleanVisibilityReferences();
-        }
-
-        return true;  // Allow teleport to continue
-    }
-
    void OnPlayerAfterUpdate(Player* player, uint32 diff) override
    {
        if (PlayerbotAI* botAI = GET_PLAYERBOT_AI(player))
@@ -316,7 +295,7 @@ public:
        LOG_INFO("server.loading", "║     mod-playerbots is a community-driven open-source     ║");
        LOG_INFO("server.loading", "║  project based on AzerothCore, licensed under AGPLv3.0   ║");
        LOG_INFO("server.loading", "╟──────────────────────────────────────────────────────────╢");
-        LOG_INFO("server.loading", "║      https://github.com/mod-playerbots/mod-playerbots    ║");
+        LOG_INFO("server.loading", "║      https://github.com/liyunfan1223/mod-playerbots      ║");
        LOG_INFO("server.loading", "╚══════════════════════════════════════════════════════════╝");

        uint32 oldMSTime = getMSTime();
--- a/src/RandomPlayerbotMgr.cpp
+++ b/src/RandomPlayerbotMgr.cpp
@@ -1517,38 +1517,33 @@ bool RandomPlayerbotMgr::ProcessBot(uint32 bot)
    return false;
 }

-bool RandomPlayerbotMgr::ProcessBot(Player* bot)
+bool RandomPlayerbotMgr::ProcessBot(Player* player)
 {
+    uint32 bot = player->GetGUID().GetCounter();

-    PlayerbotAI* botAI = GET_PLAYERBOT_AI(bot);
-    if (!botAI)
+    if (player->InBattleground())
        return false;

-    if (bot->InBattleground())
+    if (player->InBattlegroundQueue())
        return false;

-    if (bot->InBattlegroundQueue())
-        return false;
-
-     uint32 botId = bot->GetGUID().GetCounter();
-
    // if death revive
-    if (bot->isDead())
+    if (player->isDead())
    {
-        if (!GetEventValue(botId, "dead"))
+        if (!GetEventValue(bot, "dead"))
        {
            uint32 randomTime =
                urand(sPlayerbotAIConfig->minRandomBotReviveTime, sPlayerbotAIConfig->maxRandomBotReviveTime);
-            LOG_DEBUG("playerbots", "Mark bot {} as dead, will be revived in {}s.", bot->GetName().c_str(),
+            LOG_DEBUG("playerbots", "Mark bot {} as dead, will be revived in {}s.", player->GetName().c_str(),
                      randomTime);
-            SetEventValue(botId, "dead", 1, sPlayerbotAIConfig->maxRandomBotInWorldTime);
-            SetEventValue(botId, "revive", 1, randomTime);
+            SetEventValue(bot, "dead", 1, sPlayerbotAIConfig->maxRandomBotInWorldTime);
+            SetEventValue(bot, "revive", 1, randomTime);
            return false;
        }

-        if (!GetEventValue(botId, "revive"))
+        if (!GetEventValue(bot, "revive"))
        {
-            Revive(bot);
+            Revive(player);
            return true;
        }

@@ -1556,31 +1551,34 @@ bool RandomPlayerbotMgr::ProcessBot(Player* bot)
    }

    // leave group if leader is rndbot
-    Group* group = bot->GetGroup();
+    Group* group = player->GetGroup();
    if (group && !group->isLFGGroup() && IsRandomBot(group->GetLeader()))
    {
-        botAI->LeaveOrDisbandGroup();
-        LOG_INFO("playerbots", "Bot {} remove from group since leader is random bot.", bot->GetName().c_str());
+        player->RemoveFromGroup();
+        LOG_INFO("playerbots", "Bot {} remove from group since leader is random bot.", player->GetName().c_str());
    }

    // only randomize and teleport idle bots
    bool idleBot = false;
-    if (TravelTarget* target = botAI->GetAiObjectContext()->GetValue<TravelTarget*>("travel target")->Get())
+    PlayerbotAI* botAI = GET_PLAYERBOT_AI(player);
+    if (botAI)
    {
-        if (target->getTravelState() == TravelState::TRAVEL_STATE_IDLE)
+        if (TravelTarget* target = botAI->GetAiObjectContext()->GetValue<TravelTarget*>("travel target")->Get())
+        {
+            if (target->getTravelState() == TravelState::TRAVEL_STATE_IDLE)
+            {
+                idleBot = true;
+            }
+        }
+        else
        {
            idleBot = true;
        }
    }
-    else
-    {
-        idleBot = true;
-    }
-    
    if (idleBot)
    {
        // randomize
-        uint32 randomize = GetEventValue(botId, "randomize");
+        uint32 randomize = GetEventValue(bot, "randomize");
        if (!randomize)
        {
            // bool randomiser = true;
@@ -1604,12 +1602,12 @@ bool RandomPlayerbotMgr::ProcessBot(Player* bot)
            // }
            // if (randomiser)
            // {
-            Randomize(bot);
-            LOG_DEBUG("playerbots", "Bot #{} {}:{} <{}>: randomized", botId,
-                      bot->GetTeamId() == TEAM_ALLIANCE ? "A" : "H", bot->GetLevel(), bot->GetName());
+            Randomize(player);
+            LOG_DEBUG("playerbots", "Bot #{} {}:{} <{}>: randomized", bot,
+                      player->GetTeamId() == TEAM_ALLIANCE ? "A" : "H", player->GetLevel(), player->GetName());
            uint32 randomTime =
                urand(sPlayerbotAIConfig->minRandomBotRandomizeTime, sPlayerbotAIConfig->maxRandomBotRandomizeTime);
-            ScheduleRandomize(botId, randomTime);
+            ScheduleRandomize(bot, randomTime);
            return true;
        }

@@ -1621,15 +1619,15 @@ bool RandomPlayerbotMgr::ProcessBot(Player* bot)
        //     return true;
        // }

-        uint32 teleport = GetEventValue(botId, "teleport");
+        uint32 teleport = GetEventValue(bot, "teleport");
        if (!teleport)
        {
-            LOG_DEBUG("playerbots", "Bot #{} <{}>: teleport for level and refresh", botId, bot->GetName());
-            Refresh(bot);
-            RandomTeleportForLevel(bot);
+            LOG_DEBUG("playerbots", "Bot #{} <{}>: teleport for level and refresh", bot, player->GetName());
+            Refresh(player);
+            RandomTeleportForLevel(player);
            uint32 time = urand(sPlayerbotAIConfig->minRandomBotTeleportInterval,
                                sPlayerbotAIConfig->maxRandomBotTeleportInterval);
-            ScheduleTeleport(botId, time);
+            ScheduleTeleport(bot, time);
            return true;
        }
    }
@@ -1773,7 +1771,6 @@ void RandomPlayerbotMgr::RandomTeleport(Player* bot, std::vector<WorldLocation>&
        PlayerbotAI* botAI = GET_PLAYERBOT_AI(bot);
        if (botAI)
            botAI->Reset(true);
-        bot->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TELEPORTED | AURA_INTERRUPT_FLAG_CHANGE_MAP);
        bot->TeleportTo(loc.GetMapId(), x, y, z, 0);
        bot->SendMovementFlagUpdate();

@@ -2379,10 +2376,6 @@ void RandomPlayerbotMgr::IncreaseLevel(Player* bot)

 void RandomPlayerbotMgr::RandomizeFirst(Player* bot)
 {
-    PlayerbotAI* botAI = GET_PLAYERBOT_AI(bot);
-    if (!botAI)
-        return;
-
    uint32 maxLevel = sPlayerbotAIConfig->randomBotMaxLevel;
    if (maxLevel > sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL))
        maxLevel = sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL);
@@ -2440,6 +2433,7 @@ void RandomPlayerbotMgr::RandomizeFirst(Player* bot)
    }

    SetValue(bot, "level", level);
+
    PlayerbotFactory factory(bot, level);
    factory.Randomize(false);

@@ -2461,10 +2455,11 @@ void RandomPlayerbotMgr::RandomizeFirst(Player* bot)
    PlayerbotsDatabase.Execute(stmt);

    // teleport to a random inn for bot level
-    botAI->Reset(true);
+    if (GET_PLAYERBOT_AI(bot))
+        GET_PLAYERBOT_AI(bot)->Reset(true);

    if (bot->GetGroup())
-        botAI->LeaveOrDisbandGroup();
+        bot->RemoveFromGroup();

    if (pmo)
        pmo->finish();
@@ -2474,13 +2469,12 @@ void RandomPlayerbotMgr::RandomizeFirst(Player* bot)

 void RandomPlayerbotMgr::RandomizeMin(Player* bot)
 {
-    PlayerbotAI* botAI = GET_PLAYERBOT_AI(bot);
-    if (!botAI)
-        return;
-
    PerformanceMonitorOperation* pmo = sPerformanceMonitor->start(PERF_MON_RNDBOT, "RandomizeMin");
+
    uint32 level = sPlayerbotAIConfig->randomBotMinLevel;
+
    SetValue(bot, "level", level);
+
    PlayerbotFactory factory(bot, level);
    factory.Randomize(false);

@@ -2502,10 +2496,11 @@ void RandomPlayerbotMgr::RandomizeMin(Player* bot)
    PlayerbotsDatabase.Execute(stmt);

    // teleport to a random inn for bot level
-    botAI->Reset(true);
+    if (GET_PLAYERBOT_AI(bot))
+        GET_PLAYERBOT_AI(bot)->Reset(true);

    if (bot->GetGroup())
-        botAI->LeaveOrDisbandGroup();
+        bot->RemoveFromGroup();

    if (pmo)
        pmo->finish();
@@ -2587,7 +2582,7 @@ void RandomPlayerbotMgr::Refresh(Player* bot)
    bot->SetMoney(money + 500 * sqrt(urand(1, bot->GetLevel() * 5)));

    if (bot->GetGroup())
-        botAI->LeaveOrDisbandGroup();
+        bot->RemoveFromGroup();

    if (pmo)
        pmo->finish();
@@ -3095,7 +3090,6 @@ void RandomPlayerbotMgr::OnPlayerLogin(Player* player)
            } while (true);
        }

-        player->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TELEPORTED | AURA_INTERRUPT_FLAG_CHANGE_MAP);
        player->TeleportTo(botPos);

        // player->Relocate(botPos.getX(), botPos.getY(), botPos.getZ(), botPos.getO());
--- a/src/TravelNode.cpp
+++ b/src/TravelNode.cpp
@@ -178,9 +178,6 @@ uint32 TravelNodePath::getPrice()

    TaxiPathEntry const* taxiPath = sTaxiPathStore.LookupEntry(pathObject);

-    if (!taxiPath)
-        return 0;
-	
    return taxiPath->price;
 }

--- a/src/factory/PlayerbotFactory.cpp
+++ b/src/factory/PlayerbotFactory.cpp
@@ -4287,7 +4287,7 @@ void PlayerbotFactory::ApplyEnchantTemplate(uint8 spec)
    // const SpellItemEnchantmentEntry* a = sSpellItemEnchantmentStore.LookupEntry(1);
 }

-void PlayerbotFactory::ApplyEnchantAndGemsNew(bool destroyOld)
+void PlayerbotFactory::ApplyEnchantAndGemsNew(bool destoryOld)
 {
    //int32 bestGemEnchantId[4] = {-1, -1, -1, -1};  // 1, 2, 4, 8 color //not used, line marked for removal.
    //float bestGemScore[4] = {0, 0, 0, 0}; //not used, line marked for removal.
--- a/src/factory/PlayerbotFactory.h
+++ b/src/factory/PlayerbotFactory.h
@@ -79,7 +79,7 @@ public:
    void InitFood();
    void InitMounts();
    void InitBags(bool destroyOld = true);
-    void ApplyEnchantAndGemsNew(bool destroyOld = true);
+    void ApplyEnchantAndGemsNew(bool destoryOld = true);
    void InitInstanceQuests();
    void UnbindInstance();
    void InitKeyring();
--- a/src/factory/StatsWeightCalculator.cpp
+++ b/src/factory/StatsWeightCalculator.cpp
@@ -92,18 +92,9 @@ float StatsWeightCalculator::CalculateItem(uint32 itemId, int32 randomPropertyId
    CalculateSocketBonus(player_, proto);

    if (enable_quality_blend_)
-    {
-        // Heirloom items scale with player level
-        // Use player level as effective item level for heirlooms - Quality EPIC
-        // Else - Blend with item quality and level for normal items
-        if (proto->Quality == ITEM_QUALITY_HEIRLOOM)
-            weight_ *= PlayerbotFactory::CalcMixedGearScore(lvl, ITEM_QUALITY_EPIC); 
-        else
-            weight_ *= PlayerbotFactory::CalcMixedGearScore(proto->ItemLevel, proto->Quality);
+        // Blend with item quality and level
+        weight_ *= PlayerbotFactory::CalcMixedGearScore(proto->ItemLevel, proto->Quality);

-        return weight_;
-    }
-    // If quality/level blending is disabled, also return the calculated weight.
    return weight_;
 }

--- a/src/strategy/actions/BattleGroundJoinAction.cpp
+++ b/src/strategy/actions/BattleGroundJoinAction.cpp
@@ -176,7 +176,6 @@ bool BGJoinAction::gatherArenaTeam(ArenaType type)
            continue;

        memberBotAI->Reset();
-        member->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TELEPORTED | AURA_INTERRUPT_FLAG_CHANGE_MAP);
        member->TeleportTo(bot->GetMapId(), bot->GetPositionX(), bot->GetPositionY(), bot->GetPositionZ(), 0);

        LOG_INFO("playerbots", "Bot {} <{}>: Member of <{}>", member->GetGUID().ToString().c_str(),
--- a/src/strategy/actions/BattleGroundTactics.cpp
+++ b/src/strategy/actions/BattleGroundTactics.cpp
@@ -4289,15 +4289,9 @@ bool ArenaTactics::moveToCenter(Battleground* bg)
            {
                // they like to hang around at the tip of the pipes doing nothing, so we just teleport them down
                if (bot->GetDistance(1333.07f, 817.18f, 13.35f) < 4)
-                {
-                    bot->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TELEPORTED | AURA_INTERRUPT_FLAG_CHANGE_MAP);
                    bot->TeleportTo(bg->GetMapId(), 1330.96f, 816.75f, 3.2f, bot->GetOrientation());
-                }
                if (bot->GetDistance(1250.13f, 764.79f, 13.34f) < 4)
-                {
-                    bot->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TELEPORTED | AURA_INTERRUPT_FLAG_CHANGE_MAP);
                    bot->TeleportTo(bg->GetMapId(), 1252.19f, 765.41f, 3.2f, bot->GetOrientation());
-                }
            }
            break;
        case BATTLEGROUND_RV:
--- a/src/strategy/actions/ChatActionContext.h
+++ b/src/strategy/actions/ChatActionContext.h
@@ -82,7 +82,7 @@
 #include "TameAction.h"
 #include "TellGlyphsAction.h"
 #include "EquipGlyphsAction.h"
-#include "PetsAction.h"
+#include "PetAction.h"

 class ChatActionContext : public NamedObjectContext<Action>
 {
@@ -307,8 +307,8 @@ private:
    static Action* tame(PlayerbotAI* botAI) { return new TameAction(botAI); }
    static Action* glyphs(PlayerbotAI* botAI) { return new TellGlyphsAction(botAI); } // Added for custom Glyphs
    static Action* glyph_equip(PlayerbotAI* ai) { return new EquipGlyphsAction(ai); } // Added for custom Glyphs
-    static Action* pet(PlayerbotAI* botAI) { return new PetsAction(botAI); }
-    static Action* pet_attack(PlayerbotAI* botAI) { return new PetsAction(botAI, "attack"); }
+    static Action* pet(PlayerbotAI* botAI) { return new PetAction(botAI); }
+    static Action* pet_attack(PlayerbotAI* botAI) { return new PetAction(botAI, "attack"); }
    static Action* roll_action(PlayerbotAI* botAI) { return new RollAction(botAI); }
 };

--- a/src/strategy/actions/ChatShortcutActions.cpp
+++ b/src/strategy/actions/ChatShortcutActions.cpp
@@ -106,7 +106,6 @@ bool FollowChatShortcutAction::Execute(Event event)
        else
            botAI->TellMaster("You are too far away from me! I will there soon.");

-        bot->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TELEPORTED | AURA_INTERRUPT_FLAG_CHANGE_MAP);
        bot->TeleportTo(master->GetMapId(), master->GetPositionX(), master->GetPositionY(), master->GetPositionZ(),
    master->GetOrientation()); return true;
    }
--- a/src/strategy/actions/LeaveGroupAction.cpp
+++ b/src/strategy/actions/LeaveGroupAction.cpp
@@ -72,10 +72,8 @@ bool UninviteAction::Execute(Event event)

 bool LeaveGroupAction::Leave(Player* player)
 {
-    if (player &&
-        !botAI &&
+    if (player && !GET_PLAYERBOT_AI(player) &&
        !botAI->GetSecurity()->CheckLevelFor(PLAYERBOT_SECURITY_INVITE, false, player))
-
        return false;

    bool aiMaster = GET_PLAYERBOT_AI(botAI->GetMaster()) != nullptr;
@@ -86,7 +84,7 @@ bool LeaveGroupAction::Leave(Player* player)
    bool shouldStay = randomBot && bot->GetGroup() && player == bot;
    if (!shouldStay)
    {
-        botAI->LeaveOrDisbandGroup();
+        bot->RemoveFromGroup();
    }

    if (randomBot)
--- a/src/strategy/actions/MovementActions.cpp
+++ b/src/strategy/actions/MovementActions.cpp
@@ -199,8 +199,7 @@ bool MovementAction::MoveTo(uint32 mapId, float x, float y, float z, bool idle,
    {
        VehicleSeatEntry const* seat = vehicle->GetSeatForPassenger(bot);
        Unit* vehicleBase = vehicle->GetBase();
-        // If the mover (vehicle) can fly, we DO NOT want an mmaps path (2D ground) => disable pathfinding
-        generatePath = !vehicleBase || !vehicleBase->CanFly();
+        generatePath = vehicleBase->CanFly();
        if (!vehicleBase || !seat || !seat->CanControl())  // is passenger and cant move anyway
            return false;

@@ -208,20 +207,14 @@ bool MovementAction::MoveTo(uint32 mapId, float x, float y, float z, bool idle,
        if (distance > 0.01f)
        {
            MotionMaster& mm = *vehicleBase->GetMotionMaster();  // need to move vehicle, not bot
-            // Disable ground pathing if the bot/master/vehicle are flying
-            auto isFlying = [](Unit* u){ return u && (u->HasUnitMovementFlag(MOVEMENTFLAG_FLYING) || u->IsInFlight()); };
-            bool allowPathVeh = generatePath;
-            Unit* masterVeh = botAI ? botAI->GetMaster() : nullptr;
-            if (isFlying(vehicleBase) || isFlying(bot) || isFlying(masterVeh))
-                allowPathVeh = false;
            mm.Clear();
            if (!backwards)
            {
-                mm.MovePoint(0, x, y, z, FORCED_MOVEMENT_NONE, 0.0f, 0.0f, allowPathVeh);
+                mm.MovePoint(0, x, y, z, generatePath);
            }
            else
            {
-                mm.MovePointBackwards(0, x, y, z, allowPathVeh);
+                mm.MovePointBackwards(0, x, y, z, generatePath);
            }
            float speed = backwards ? vehicleBase->GetSpeed(MOVE_RUN_BACK) : vehicleBase->GetSpeed(MOVE_RUN);
            float delay = 1000.0f * (distance / speed);
@@ -248,22 +241,15 @@ bool MovementAction::MoveTo(uint32 mapId, float x, float y, float z, bool idle,
            //     bot->CastStop();
            //     botAI->InterruptSpell();
            // }
-            
            MotionMaster& mm = *bot->GetMotionMaster();
-            // No ground pathfinding if the bot/master are flying => allow true 3D (Z) movement
-            auto isFlying = [](Unit* u){ return u && (u->HasUnitMovementFlag(MOVEMENTFLAG_FLYING) || u->IsInFlight()); };
-            bool allowPath = generatePath;
-            Unit* master = botAI ? botAI->GetMaster() : nullptr;
-            if (isFlying(bot) || isFlying(master))
-                allowPath = false;
            mm.Clear();
            if (!backwards)
            {
-                mm.MovePoint(0, x, y, z, FORCED_MOVEMENT_NONE, 0.0f, 0.0f, allowPath);
+                mm.MovePoint(0, x, y, z, generatePath);
            }
            else
            {
-                mm.MovePointBackwards(0, x, y, z, allowPath);
+                mm.MovePointBackwards(0, x, y, z, generatePath);
            }
            float delay = 1000.0f * MoveDelay(distance, backwards);
            if (lessDelay)
@@ -296,23 +282,16 @@ bool MovementAction::MoveTo(uint32 mapId, float x, float y, float z, bool idle,
            //     bot->CastStop();
            //     botAI->InterruptSpell();
            // }
-
            MotionMaster& mm = *bot->GetMotionMaster();
            G3D::Vector3 endP = path.back();
-            // No ground pathfinding if the bot/master are flying => allow true 3D (Z) movement
-            auto isFlying = [](Unit* u){ return u && (u->HasUnitMovementFlag(MOVEMENTFLAG_FLYING) || u->IsInFlight()); };
-            bool allowPath = generatePath;
-            Unit* master = botAI ? botAI->GetMaster() : nullptr;
-            if (isFlying(bot) || isFlying(master))
-                allowPath = false;
            mm.Clear();
            if (!backwards)
            {
-                mm.MovePoint(0, x, y, z, FORCED_MOVEMENT_NONE, 0.0f, 0.0f, allowPath);
+                mm.MovePoint(0, x, y, z, generatePath);
            }
            else
            {
-                mm.MovePointBackwards(0, x, y, z, allowPath);
+                mm.MovePointBackwards(0, x, y, z, generatePath);
            }
            float delay = 1000.0f * MoveDelay(distance, backwards);
            if (lessDelay)
@@ -1034,49 +1013,18 @@ void MovementAction::UpdateMovementState()
                    bot->GetMapWaterOrGroundLevel(bot->GetPositionX(), bot->GetPositionY(), bot->GetPositionZ()) + 1.0f;

    // Keep bot->SendMovementFlagUpdate() withing the if statements to not intefere with bot behavior on ground/(shallow) waters
-
-    bool hasFlightAura = bot->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED) || bot->HasAuraType(SPELL_AURA_FLY);
-    if (hasFlightAura)
+    if (!bot->HasUnitMovementFlag(MOVEMENTFLAG_FLYING) &&
+        bot->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED) && !onGround)
    {
-        bool changed = false;
-        if (!bot->HasUnitMovementFlag(MOVEMENTFLAG_CAN_FLY))
-        {
-            bot->AddUnitMovementFlag(MOVEMENTFLAG_CAN_FLY);
-            changed = true;
-        }
-        if (!bot->HasUnitMovementFlag(MOVEMENTFLAG_DISABLE_GRAVITY))
-        {
-            bot->AddUnitMovementFlag(MOVEMENTFLAG_DISABLE_GRAVITY);
-            changed = true;
-        }
-        if (!bot->HasUnitMovementFlag(MOVEMENTFLAG_FLYING))
-        {
-            bot->AddUnitMovementFlag(MOVEMENTFLAG_FLYING);
-            changed = true;
-        }
-        if (changed)
-            bot->SendMovementFlagUpdate();
+        bot->AddUnitMovementFlag(MOVEMENTFLAG_FLYING);
+        bot->SendMovementFlagUpdate();
    }
-    else if (!hasFlightAura)
+
+    else if (bot->HasUnitMovementFlag(MOVEMENTFLAG_FLYING) &&
+        (!bot->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED) || onGround))
    {
-        bool changed = false;
-        if (bot->HasUnitMovementFlag(MOVEMENTFLAG_FLYING))
-        {
-            bot->RemoveUnitMovementFlag(MOVEMENTFLAG_FLYING);
-            changed = true;
-        }
-        if (bot->HasUnitMovementFlag(MOVEMENTFLAG_DISABLE_GRAVITY))
-        {
-            bot->RemoveUnitMovementFlag(MOVEMENTFLAG_DISABLE_GRAVITY);
-            changed = true;
-        }
-        if (bot->HasUnitMovementFlag(MOVEMENTFLAG_CAN_FLY))
-        {
-            bot->RemoveUnitMovementFlag(MOVEMENTFLAG_CAN_FLY);
-            changed = true;
-        }
-        if (changed)
-            bot->SendMovementFlagUpdate();
+        bot->RemoveUnitMovementFlag(MOVEMENTFLAG_FLYING);
+        bot->SendMovementFlagUpdate();
    }

    // See if the bot is currently slowed, rooted, or otherwise unable to move
@@ -1174,6 +1122,13 @@ bool MovementAction::Follow(Unit* target, float distance, float angle)
    if (!target)
        return false;

+    if (!bot->InBattleground() && sServerFacade->IsDistanceLessOrEqualThan(sServerFacade->GetDistance2d(bot, target),
+                                                                           sPlayerbotAIConfig->followDistance))
+    {
+        // botAI->TellError("No need to follow");
+        return false;
+    }
+
    /*
    if (!bot->InBattleground()
        && sServerFacade->IsDistanceLessOrEqualThan(sServerFacade->GetDistance2d(bot, target->GetPositionX(),
@@ -1193,7 +1148,6 @@ bool MovementAction::Follow(Unit* target, float distance, float angle)
            if ((target->GetMap() && target->GetMap()->IsBattlegroundOrArena()) || (bot->GetMap() &&
    bot->GetMap()->IsBattlegroundOrArena())) return false;

-            bot->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TELEPORTED | AURA_INTERRUPT_FLAG_CHANGE_MAP);
            bot->TeleportTo(target->GetMapId(), x, y, z, bot->GetOrientation());
        }
        else
@@ -1221,7 +1175,6 @@ bool MovementAction::Follow(Unit* target, float distance, float angle)

        bot->CombatStop(true);
        botAI->TellMasterNoFacing("I will there soon.");
-        bot->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TELEPORTED | AURA_INTERRUPT_FLAG_CHANGE_MAP);
        bot->TeleportTo(target->GetMapId(), target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(),
    target->GetOrientation()); return false;
    }
@@ -1291,17 +1244,21 @@ bool MovementAction::Follow(Unit* target, float distance, float angle)
            return MoveTo(target, sPlayerbotAIConfig->followDistance);
    }

+    if (sServerFacade->IsDistanceLessOrEqualThan(sServerFacade->GetDistance2d(bot, target),
+                                                 sPlayerbotAIConfig->followDistance))
+    {
+        // botAI->TellError("No need to follow");
+        return false;
+    }
+
    if (target->IsFriendlyTo(bot) && bot->IsMounted() && AI_VALUE(GuidVector, "all targets").empty())
        distance += angle;

-    // Do not cancel follow if the 2D distance is short but the Z still differs (e.g., master above).
-    float dz1 = fabs(bot->GetPositionZ() - target->GetPositionZ());
-    if (!bot->InBattleground()
-        && sServerFacade->IsDistanceLessOrEqualThan(sServerFacade->GetDistance2d(bot, target), sPlayerbotAIConfig->followDistance)
-        && dz1 < sPlayerbotAIConfig->contactDistance)
+    if (!bot->InBattleground() && sServerFacade->IsDistanceLessOrEqualThan(sServerFacade->GetDistance2d(bot, target),
+                                                                           sPlayerbotAIConfig->followDistance))
    {
        // botAI->TellError("No need to follow");
-        return false; // truly in range (2D and Z) => no need to move
+        return false;
    }

    bot->HandleEmoteCommand(0);
--- a/src/strategy/actions/PetsAction.cpp
+++ b/src/strategy/actions/PetsAction.cpp
@@ -3,7 +3,7 @@
 * and/or modify it under version 3 of the License, or (at your option), any later version.
 */

-#include "PetsAction.h"
+#include "PetAction.h"

 #include "CharmInfo.h"
 #include "Creature.h"
@@ -13,7 +13,7 @@
 #include "PlayerbotAI.h"
 #include "SharedDefines.h"

-bool PetsAction::Execute(Event event)
+bool PetAction::Execute(Event event)
 {
    // Extract the command parameter from the event (e.g., "aggressive", "defensive", "attack", etc.)
    std::string param = event.getParam();
--- a/src/strategy/actions/PetsAction.h
+++ b/src/strategy/actions/PetsAction.h
@@ -3,8 +3,8 @@
 * and/or modify it under version 3 of the License, or (at your option), any later version.
 */

-#ifndef _PLAYERBOT_PETSACTION_H
-#define _PLAYERBOT_PETSACTION_H
+#ifndef _PLAYERBOT_PETACTION_H
+#define _PLAYERBOT_PETACTION_H

 #include <string>

@@ -14,10 +14,10 @@

 class PlayerbotAI;

-class PetsAction : public Action
+class PetAction : public Action
 {
 public:
-    PetsAction(PlayerbotAI* botAI, const std::string& defaultCmd = "") : Action(botAI, "pet"), defaultCmd(defaultCmd) {}
+    PetAction(PlayerbotAI* botAI, const std::string& defaultCmd = "") : Action(botAI, "pet"), defaultCmd(defaultCmd) {}

    bool Execute(Event event) override;

--- a/src/strategy/actions/ReleaseSpiritAction.cpp
+++ b/src/strategy/actions/ReleaseSpiritAction.cpp
@@ -147,7 +147,6 @@ bool AutoReleaseSpiritAction::HandleBattlegroundSpiritHealer()
        // and in IOC it's not within clicking range when they res in own base

        // Teleport to nearest friendly Spirit Healer when not currently in range of one.
-        bot->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TELEPORTED | AURA_INTERRUPT_FLAG_CHANGE_MAP);
        bot->TeleportTo(bot->GetMapId(), spiritHealer->GetPositionX(), spiritHealer->GetPositionY(), spiritHealer->GetPositionZ(), 0.f);
        RESET_AI_VALUE(bool, "combat::self target");
        RESET_AI_VALUE(WorldPosition, "current position");
@@ -192,11 +191,12 @@ bool AutoReleaseSpiritAction::ShouldDelayBattlegroundRelease() const
 {
    // The below delays release to spirit with 6 seconds.
    // This prevents currently casted (ranged) spells to be re-directed to the died bot's ghost.
+    const int32_t botId = bot->GetGUID().GetRawValue();

-    // If the bot already is a spirit, reset release time and return true
+    // If the bot already is a spirit, erase release time and return true
    if (bot->HasPlayerFlag(PLAYER_FLAGS_GHOST))
    {
-        botAI->bgReleaseAttemptTime = 0;
+        m_botReleaseTimes.erase(botId);
        return true;
    }

@@ -204,13 +204,14 @@ bool AutoReleaseSpiritAction::ShouldDelayBattlegroundRelease() const
    const time_t now = time(nullptr);
    constexpr time_t RELEASE_DELAY = 6;

-    if (botAI->bgReleaseAttemptTime == 0)
-        botAI->bgReleaseAttemptTime = now;
+    auto& lastReleaseTime = m_botReleaseTimes[botId];
+    if (lastReleaseTime == 0)
+        lastReleaseTime = now;

-    if (now - botAI->bgReleaseAttemptTime < RELEASE_DELAY)
+    if (now - lastReleaseTime < RELEASE_DELAY)
        return false;

-    botAI->bgReleaseAttemptTime = 0;
+    m_botReleaseTimes.erase(botId);
    return true;
 }

@@ -243,7 +244,6 @@ int64 RepopAction::CalculateDeadTime() const

 void RepopAction::PerformGraveyardTeleport(const GraveyardStruct* graveyard) const
 {
-    bot->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TELEPORTED | AURA_INTERRUPT_FLAG_CHANGE_MAP);
    bot->TeleportTo(graveyard->Map, graveyard->x, graveyard->y, graveyard->z, 0.f);
    RESET_AI_VALUE(bool, "combat::self target");
    RESET_AI_VALUE(WorldPosition, "current position");
--- a/src/strategy/actions/ReleaseSpiritAction.h
+++ b/src/strategy/actions/ReleaseSpiritAction.h
@@ -38,6 +38,7 @@ private:
    bool ShouldAutoRelease() const;
    bool ShouldDelayBattlegroundRelease() const;

+    inline static std::unordered_map<uint32_t, time_t> m_botReleaseTimes;
    time_t m_bgGossipTime = 0;
 };

--- a/src/strategy/actions/ReviveFromCorpseAction.cpp
+++ b/src/strategy/actions/ReviveFromCorpseAction.cpp
@@ -169,7 +169,6 @@ bool FindCorpseAction::Execute(Event event)
        if (deadTime > delay)
        {
            bot->GetMotionMaster()->Clear();
-            bot->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TELEPORTED | AURA_INTERRUPT_FLAG_CHANGE_MAP);
            bot->TeleportTo(moveToPos.getMapId(), moveToPos.getX(), moveToPos.getY(), moveToPos.getZ(), 0);
        }

@@ -351,7 +350,6 @@ bool SpiritHealerAction::Execute(Event event)
    // if (!botAI->HasActivePlayerMaster())
    // {
    context->GetValue<uint32>("death count")->Set(dCount + 1);
-    bot->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TELEPORTED | AURA_INTERRUPT_FLAG_CHANGE_MAP);
    return bot->TeleportTo(ClosestGrave->Map, ClosestGrave->x, ClosestGrave->y, ClosestGrave->z, 0.f);
    // }

--- a/src/strategy/actions/TalkToQuestGiverAction.cpp
+++ b/src/strategy/actions/TalkToQuestGiverAction.cpp
@@ -205,18 +205,17 @@ void TalkToQuestGiverAction::RewardMultipleItem(Quest const* quest, Object* ques
    }
    else
    {
-        // Try to pick the usable item. If multiple, list usable rewards.
+        // Try to pick the usable item. If multiple list usable rewards.
        bestIds = BestRewards(quest);
-
-        if (bestIds.size() > 1)
+        if (!bestIds.empty())
+        {
            AskToSelectReward(quest, out, true);
-
-        else if (!bestIds.empty())
+        }
+        else
        {
            // Pick the first item
-            uint32 firstId = *bestIds.begin();
-            ItemTemplate const* item = sObjectMgr->GetItemTemplate(quest->RewardChoiceItemId[firstId]);
-            bot->RewardQuest(quest, firstId, questGiver, true);
+            ItemTemplate const* item = sObjectMgr->GetItemTemplate(quest->RewardChoiceItemId[*bestIds.begin()]);
+            bot->RewardQuest(quest, *bestIds.begin(), questGiver, true);

            out << "Rewarded " << ChatHelper::FormatItem(item);
        }
--- a/src/strategy/actions/UseMeetingStoneAction.cpp
+++ b/src/strategy/actions/UseMeetingStoneAction.cpp
@@ -225,7 +225,6 @@ bool SummonAction::Teleport(Player* summoner, Player* player)

                player->GetMotionMaster()->Clear();
                AI_VALUE(LastMovement&, "last movement").clear();
-                player->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TELEPORTED | AURA_INTERRUPT_FLAG_CHANGE_MAP);
                player->TeleportTo(mapId, x, y, z, 0);

                if (botAI->HasStrategy("stay", botAI->GetState()))
--- a/src/strategy/actions/WorldPacketActionContext.h
+++ b/src/strategy/actions/WorldPacketActionContext.h
@@ -41,7 +41,7 @@
 #include "UseMeetingStoneAction.h"
 #include "NamedObjectContext.h"
 #include "ReleaseSpiritAction.h"
-#include "PetsAction.h"
+#include "PetAction.h"

 class PlayerbotAI;

@@ -141,7 +141,7 @@ private:
    static Action* tell_not_enough_reputation(PlayerbotAI* botAI) { return new TellMasterAction(botAI, "Not enough reputation"); }
    static Action* tell_cannot_equip(PlayerbotAI* botAI) { return new InventoryChangeFailureAction(botAI); }
    static Action* self_resurrect(PlayerbotAI* botAI) { return new SelfResurrectAction(botAI); }
-    static Action* pet(PlayerbotAI* botAI) { return new PetsAction(botAI); }
+    static Action* pet(PlayerbotAI* botAI) { return new PetAction(botAI); }

    // quest
    static Action* quest_update_add_kill(PlayerbotAI* ai) { return new QuestUpdateAddKillAction(ai); }
--- a/src/strategy/raids/icecrown/RaidIccMultipliers.cpp
+++ b/src/strategy/raids/icecrown/RaidIccMultipliers.cpp
@@ -472,6 +472,7 @@ float IccBqlMultiplier::GetValue(Action* action)
        else
            return 0.0f;  // Cancel all other actions when we need to handle Swarming Shadows
    }
+    return 1.0f;

    if ((boss->GetExactDist2d(ICC_BQL_TANK_POSITION.GetPositionX(), ICC_BQL_TANK_POSITION.GetPositionY()) > 10.0f) &&
        botAI->IsRanged(bot) && !((boss->GetPositionZ() - bot->GetPositionZ()) > 5.0f))
@@ -480,7 +481,6 @@ float IccBqlMultiplier::GetValue(Action* action)
            return 0.0f;
    }

-    return 1.0f;
 }

 //VDW
--- a/src/strategy/rpg/NewRpgBaseAction.cpp
+++ b/src/strategy/rpg/NewRpgBaseAction.cpp
@@ -67,7 +67,6 @@ bool NewRpgBaseAction::MoveFarTo(WorldPosition dest)
            bot->GetName(), bot->GetPositionX(), bot->GetPositionY(), bot->GetPositionZ(), bot->GetMapId(),
            dest.GetPositionX(), dest.GetPositionY(), dest.GetPositionZ(), dest.getMapId(), bot->GetZoneId(),
            zone_name);
-        bot->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TELEPORTED | AURA_INTERRUPT_FLAG_CHANGE_MAP);
        return bot->TeleportTo(dest);
    }

--- a/src/strategy/shaman/ShamanAiObjectContext.cpp
+++ b/src/strategy/shaman/ShamanAiObjectContext.cpp
@@ -41,11 +41,6 @@ class ShamanCombatStrategyFactoryInternal : public NamedObjectContext<Strategy>
 public:
    ShamanCombatStrategyFactoryInternal() : NamedObjectContext<Strategy>(false, true)
    {
-        creators["heal"] = &ShamanCombatStrategyFactoryInternal::resto;
-        creators["melee"] = &ShamanCombatStrategyFactoryInternal::enh;
-        creators["dps"] = &ShamanCombatStrategyFactoryInternal::enh;
-        creators["caster"] = &ShamanCombatStrategyFactoryInternal::ele;
-        //creators["offheal"] = &ShamanCombatStrategyFactoryInternal::offheal;
        creators["resto"] = &ShamanCombatStrategyFactoryInternal::resto;
        creators["enh"] = &ShamanCombatStrategyFactoryInternal::enh;
        creators["ele"] = &ShamanCombatStrategyFactoryInternal::ele;
--- a/src/strategy/values/ItemUsageValue.cpp
+++ b/src/strategy/values/ItemUsageValue.cpp
@@ -236,7 +236,7 @@ ItemUsage ItemUsageValue::Calculate()

 ItemUsage ItemUsageValue::QueryItemUsageForEquip(ItemTemplate const* itemProto, int32 randomPropertyId)
 {
-    if (bot->BotCanUseItem(itemProto) != EQUIP_ERR_OK)
+    if (bot->CanUseItem(itemProto) != EQUIP_ERR_OK)
        return ITEM_USAGE_NONE;

    if (itemProto->InventoryType == INVTYPE_NON_EQUIP)
--- a/src/strategy/values/PvpValues.cpp
+++ b/src/strategy/values/PvpValues.cpp
@@ -102,7 +102,7 @@ std::vector<CreatureData const*> BgMastersValue::Calculate()
        }
    }

-    return bmGuids;
+    return std::move(bmGuids);
 }

 CreatureData const* BgMasterValue::Calculate()
@@ -120,7 +120,7 @@ CreatureData const* BgMasterValue::NearestBm(bool allowDead)

    std::vector<CreatureData const*> bmPairs = AI_VALUE2(std::vector<CreatureData const*>, "bg masters", qualifier);

-    float rDist = 0.0f;
+    float rDist;
    CreatureData const* rbmPair = nullptr;

    for (auto& bmPair : bmPairs)
--- a/src/strategy/values/StatsValues.cpp
+++ b/src/strategy/values/StatsValues.cpp
@@ -119,7 +119,7 @@ bool HasManaValue::Calculate()
    if (!target)
        return false;

-    constexpr uint32 PRIEST_SPIRIT_OF_REDEMPTION_SPELL_ID = 27827u;
+    constexpr uint32 PRIEST_SPIRIT_OF_REDEMPTION_SPELL_ID = 20711u;
    if (target->HasAura(PRIEST_SPIRIT_OF_REDEMPTION_SPELL_ID))
        return false;