Merge branch 'master' of https://github.com/celguar/mangosbot-bots

celguar · Jul 12, 2023 · e585b9f · e585b9f
2 parents a214f7e + 74c1f18
commit e585b9f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 17 deletions.
diff --git a/playerbot/strategy/actions/CheckMountStateAction.cpp b/playerbot/strategy/actions/CheckMountStateAction.cpp
@@ -248,6 +248,9 @@ bool CheckMountStateAction::isUseful()
     if (!bot->GetPlayerbotAI()->HasStrategy("mount", BotState::BOT_STATE_NON_COMBAT) && !bot->IsMounted())
         return false;
 
+    if (!bot->IsMounted() && bot->IsInWater())
+        return false;
+
     bool firstmount = bot->GetLevel() >=
 #ifdef MANGOSBOT_ZERO
         40

diff --git a/playerbot/strategy/actions/MovementActions.cpp b/playerbot/strategy/actions/MovementActions.cpp
@@ -418,22 +418,7 @@ bool MovementAction::MoveTo(uint32 mapId, float x, float y, float z, bool idle,
         {
             if (!sTravelNodeMap.getNodes().empty() && !bot->InBattleGround())
             {
-                if (sPlayerbotAIConfig.tweakValue)
-                {
-                    if (lastMove.future.valid())
-                    {
-                        if(lastMove.future.wait_for(0s) != future_status::ready)
-                            return true; //we have no path. Wait until it is ready.
-                        movePath = lastMove.future.get();
-                    }
-                    else
-                    {
-                        lastMove.future = std::async(&TravelNodeMap::getFullPath, startPosition, endPosition, bot);
-                        return true;
-                    }
-                }
-                else
-                    movePath = sTravelNodeMap.getFullPath(startPosition, endPosition, bot);
+                movePath = sTravelNodeMap.getFullPath(startPosition, endPosition, bot);
 
                 if (movePath.empty())
                 {

diff --git a/playerbot/strategy/values/LastMovementValue.h b/playerbot/strategy/values/LastMovementValue.h
@@ -99,7 +99,6 @@ namespace ai
         WorldPosition lastMoveShort;
         TravelPath lastPath;
         time_t nextTeleport;
-        std::future<TravelPath> future;
     };
 
     class LastMovementValue : public ManualSetValue<LastMovement&>