From 500de1de10f4b3fd90b01e3231ba3da5dea6cb64 Mon Sep 17 00:00:00 2001
From: Fuzz <fuzzdeveloper@gmail.com>
Date: Wed, 10 Jul 2024 22:13:12 +1000
Subject: [PATCH] optionally disable bots using MotionMaster::MoveSplitPath()
 for BG/Arena or everywhere (so that stuns stun/snare/root/etc can work
 against bots)

---
 conf/playerbots.conf.dist                | 7 +++++++
 src/PlayerbotAIConfig.cpp                | 1 +
 src/PlayerbotAIConfig.h                  | 4 ++--
 src/strategy/actions/MovementActions.cpp | 4 +++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/conf/playerbots.conf.dist b/conf/playerbots.conf.dist
index 3a3c2736..016e322a 100644
--- a/conf/playerbots.conf.dist
+++ b/conf/playerbots.conf.dist
@@ -248,6 +248,13 @@ AiPlayerbot.GlobalCooldown = 500
 # Max wait time when moving
 AiPlayerbot.MaxWaitForMove = 5000
 
+# Disables use of MoveSplinePath for bot movement, will result in more erratic bot movement but means stun/snare/root/etc
+# will work on bots (they wont reliably work when MoveSplinePath is enabled, though slowing effects still work ok)
+# Default: 0 - MoveSplinePath enabled
+#          1 - MoveSplinePath disabled in BG/Arena only
+#          2 - MoveSplinePath disabled everywhere
+AiPlayerbot.DisableMoveSplinePath = 0
+
 # Max search time for movement (higher for better movement on slopes)
 # default: 3
 AiPlayerbot.MaxMovementSearchTime = 3
diff --git a/src/PlayerbotAIConfig.cpp b/src/PlayerbotAIConfig.cpp
index ed840e9c..f0921224 100644
--- a/src/PlayerbotAIConfig.cpp
+++ b/src/PlayerbotAIConfig.cpp
@@ -53,6 +53,7 @@ bool PlayerbotAIConfig::Initialize()
 
     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", 7000);
diff --git a/src/PlayerbotAIConfig.h b/src/PlayerbotAIConfig.h
index 40a66034..477f9c51 100644
--- a/src/PlayerbotAIConfig.h
+++ b/src/PlayerbotAIConfig.h
@@ -54,8 +54,8 @@ class PlayerbotAIConfig
 
         bool enabled;
         bool allowGuildBots, allowPlayerBots;
-        uint32 globalCoolDown, reactDelay, maxWaitForMove, maxMovementSearchTime, expireActionTime, 
-            dispelAuraDuration, passiveDelay, repeatDelay,
+        uint32 globalCoolDown, reactDelay, maxWaitForMove, disableMoveSplinePath, maxMovementSearchTime,
+            expireActionTime, dispelAuraDuration, passiveDelay, repeatDelay,
             errorDelay, rpgDelay, sitDelay, returnDelay, lootDelay;
         float sightDistance, spellDistance, reactDistance, grindDistance, lootDistance, shootDistance,
             fleeDistance, tooCloseDistance, meleeDistance, followDistance, whisperDistance, contactDistance,
diff --git a/src/strategy/actions/MovementActions.cpp b/src/strategy/actions/MovementActions.cpp
index f86d539e..6a67e01b 100644
--- a/src/strategy/actions/MovementActions.cpp
+++ b/src/strategy/actions/MovementActions.cpp
@@ -163,7 +163,9 @@ bool MovementAction::MoveTo(uint32 mapId, float x, float y, float z, bool idle,
     // }
     bool generatePath = !bot->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED) &&
             !bot->IsFlying() && !bot->HasUnitMovementFlag(MOVEMENTFLAG_SWIMMING) && !bot->IsInWater();
-    if (!generatePath) {
+    bool disableMoveSplinePath = sPlayerbotAIConfig->disableMoveSplinePath >= 2 ||
+        (sPlayerbotAIConfig->disableMoveSplinePath == 1 && bot->InBattleground());
+    if (disableMoveSplinePath || !generatePath) {
         float distance = bot->GetExactDist(x, y, z);
         if (distance > sPlayerbotAIConfig->contactDistance)
         {