Mount and taxi: Fixed wotlk bots mouting and using flightpaths

cmangos · Feb 1, 2025 · ea881cd · ea881cd · al3xc1985 · Feb 1, 2025
1 parent 973ba56
commit ea881cd
Showing 6 changed files with 36 additions and 5 deletions.
diff --git a/playerbot/PlayerbotAI.cpp b/playerbot/PlayerbotAI.cpp
@@ -840,6 +840,9 @@ void PlayerbotAI::Unmount()
     {
         bot->RemoveSpellsCausingAura(SPELL_AURA_MOUNTED);
         bot->Unmount();
+#ifdef MANGOSBOT_TWO
+        bot->ResolvePendingUnmount();
+#endif
 
         bot->UpdateSpeed(MOVE_RUN, true);
         bot->UpdateSpeed(MOVE_RUN, false);

diff --git a/playerbot/strategy/actions/CheckMountStateAction.cpp b/playerbot/strategy/actions/CheckMountStateAction.cpp
@@ -469,6 +469,9 @@ bool CheckMountStateAction::Mount(Player* requester)
 
             if (ai->CastSpell(mount.GetSpellId(), bot))
             {
+#ifdef MANGOSBOT_TWO
+                bot->ResolvePendingMount();
+#endif
                 sPlayerbotAIConfig.logEvent(ai, "CheckMountStateAction", sServerFacade.LookupSpellInfo(mount.GetSpellId())->SpellName[0], std::to_string(mount.GetSpeed(canFly)));
                 SetDuration(GetSpellRecoveryTime(sServerFacade.LookupSpellInfo(mount.GetSpellId())));
                 didMount = true;

diff --git a/playerbot/strategy/actions/GenericSpellActions.cpp b/playerbot/strategy/actions/GenericSpellActions.cpp
@@ -88,7 +88,7 @@ bool CastSpellAction::isPossible()
         }
         if (bot->IsInCombat())
         {
-            bot->Unmount();
+            ai->Unmount();
             return false;
         }
     }

diff --git a/playerbot/strategy/actions/MovementActions.cpp b/playerbot/strategy/actions/MovementActions.cpp
@@ -715,8 +715,13 @@ bool MovementAction::MoveTo(uint32 mapId, float x, float y, float z, bool idle,
                 {
                     bot->SetMoney(10000000);
                 }
-
+#ifdef MANGOSBOT_TWO                
+                bot->OnTaxiFlightEject(true);
+#endif
                 bool goTaxi = bot->ActivateTaxiPathTo({ tEntry->from, tEntry->to }, unit, 1);
+#ifdef MANGOSBOT_TWO
+                bot->ResolvePendingMount();
+#endif
 
                 if (ai->HasCheat(BotCheatMask::gold) || ai->HasCheat(BotCheatMask::taxi))
                 {

diff --git a/playerbot/strategy/actions/RpgSubActions.cpp b/playerbot/strategy/actions/RpgSubActions.cpp
@@ -193,11 +193,19 @@ bool RpgTaxiAction::Execute(Event& event)
         sLog.outError("Bot %s cannot talk to flightmaster (%zu location available)", bot->GetName(), nodes.size());
         return false;
     }
+#ifdef MANGOSBOT_TWO                
+    bot->OnTaxiFlightEject(true);
+#endif
     if (!bot->ActivateTaxiPathTo({ entry->from, entry->to }, flightMaster, 0))
     {
         sLog.outError("Bot %s cannot fly %u (%zu location available)", bot->GetName(), path, nodes.size());
         return false;
     }
+
+#ifdef MANGOSBOT_TWO
+    bot->ResolvePendingMount();
+#endif
+
     sLog.outString("Bot #%d <%s> is flying from %s to %s (%zu location available)", bot->GetGUIDLow(), bot->GetName(), nodeFrom->name[0], nodeTo->name[0], nodes.size());
     bot->SetMoney(money);
 

diff --git a/playerbot/strategy/actions/TaxiAction.cpp b/playerbot/strategy/actions/TaxiAction.cpp
@@ -68,10 +68,18 @@ bool TaxiAction::Execute(Event& event)
             uint32 path = nodes[selected - 1];
             TaxiPathEntry const* entry = sTaxiPathStore.LookupEntry(path);
             if (!entry) return false;
-
-            return bot->ActivateTaxiPathTo({ entry->from, entry->to }, npc, 0);
+#ifdef MANGOSBOT_TWO                
+            bot->OnTaxiFlightEject(true);
+#endif
+            bool didTaxi =  bot->ActivateTaxiPathTo({ entry->from, entry->to }, npc, 0);
+#ifdef MANGOSBOT_TWO
+            bot->ResolvePendingMount();
+#endif;
+            return didTaxi;
         }
-
+#ifdef MANGOSBOT_TWO                
+        bot->OnTaxiFlightEject(true);
+#endif
         if (!movement.taxiNodes.empty() && !bot->ActivateTaxiPathTo(movement.taxiNodes, npc))
         {
             movement.taxiNodes.clear();
@@ -81,6 +89,10 @@ bool TaxiAction::Execute(Event& event)
             return false;
         }
 
+#ifdef MANGOSBOT_TWO
+        bot->ResolvePendingMount();
+#endif
+
         return true;
     }