NPCBots: Fix bots not refreshing their ability to swim unit state

(cherry picked from commit a36b6a36e2b97da27e7d9f666f4e2346c038d1b7) # Conflicts: # src/server/game/AI/NpcBots/bot_ai.cpp # src/server/game/Entities/Creature/Creature.cpp # src/server/game/Entities/Unit/Unit.cpp
trickerer · Nov 15, 2024 · 91b1b42 · 91b1b42
1 parent 9334f8a
commit 91b1b42
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/src/server/game/AI/NpcBots/bot_ai.cpp b/src/server/game/AI/NpcBots/bot_ai.cpp
@@ -351,8 +351,6 @@ const std::string& bot_ai::LocalizedNpcText(Player const* forPlayer, uint32 text
 
 void bot_ai::InitializeAI()
 {
-    me->RefreshSwimmingFlag();
-
     if (!me->GetSpawnId() && !IsTempBot())
         SetWanderer();
 
@@ -16092,6 +16090,8 @@ void bot_ai::JustEngagedWith(Unit* u)
 
     ResetChase(u);
 
+    me->RefreshSwimmingFlag();
+
     if (IsLastOrder(BOT_ORDER_PULL, 0, u->GetGUID()))
         CompleteOrder(_orders.front());
 
@@ -19007,6 +19007,9 @@ bool bot_ai::FinishTeleport(bool reset)
         me->BotStopMovement();
         if (reset)
             this->Reset();
+
+        me->RefreshSwimmingFlag();
+
         //bot->SetAI(oldAI);
         //me->IsAIEnabled = true;
         canUpdate = true;

diff --git a/src/server/game/AI/NpcBots/botmgr.cpp b/src/server/game/AI/NpcBots/botmgr.cpp
@@ -1454,6 +1454,7 @@ void BotMgr::_reviveBot(Creature* bot, WorldLocation* dest)
     bot->Motion_Initialize();
     bot->setDeathState(DeathState::Alive);
     //bot->GetBotAI()->Reset();
+    bot->RefreshSwimmingFlag();
     bot->GetBotAI()->SetShouldUpdateStats();
 
     uint8 restore_factor = (bot->IsWandererBot() || (!bot->GetBotAI()->IAmFree() && bot->GetBotOwner()->InBattleground())) ? 1 : 4;

diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
@@ -3456,6 +3456,11 @@ bool Creature::CanSwim() const
     if (Unit::CanSwim() || (!Unit::CanSwim() && !CanFly()))
         return true;
 
+    //npcbot
+    if (IsNPCBotOrPet())
+        return true;
+    //end npcbot
+
     if (IsPet())
         return true;
 

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
@@ -21453,10 +21453,6 @@ bool Unit::CanSwim() const
         return false;
     if (HasUnitFlag(UNIT_FLAG_PET_IN_COMBAT))
         return true;
-    //npcbot
-    if (IsNPCBotOrPet())
-        return true;
-    //end npcbot
     return HasUnitFlag(UNIT_FLAG_RENAME | UNIT_FLAG_SWIMMING);
 }