Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/AI: Make charmed creatures follow their owner (#24195)

Browse Source 
* Core/AI: Make charmed creatures follow their owner

* Follow the charmer only when applying the charm

* Make SmartAI follow the charmer

(cherry picked from commit ddf2f60c13)
This commit is contained in:
Giacomo Pozzoni
2020-03-01 13:31:14 +01:00
committed by Shauren
parent 478be1f7ea
commit 144cfc2bce
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/game/AI/CoreAI/PetAI.cpp
View File

@@ -632,6 +632,14 @@ void PetAI::UpdateAllies()
_allySet.insert(owner->GetGUID());
}
void PetAI::OnCharmed(bool isNew)
{
if (me->IsCharmed())
me->GetMotionMaster()->MoveFollow(me->GetCharmer(), PET_FOLLOW_DIST, me->GetFollowAngle());
CreatureAI::OnCharmed(isNew);
}
void PetAI::ClearCharmInfoFlags()
{
CharmInfo* ci = me->GetCharmInfo();

1
src/server/game/AI/CoreAI/PetAI.h
View File

@@ -46,6 +46,7 @@ class TC_GAME_API PetAI : public CreatureAI
void ReceiveEmote(Player* player, uint32 textEmote) override;
void JustEnteredCombat(Unit* who) override { EngagementStart(who); }
void JustExitedCombat() override { EngagementOver(); }
void OnCharmed(bool isNew) override;
// The following aren't used by the PetAI but need to be defined to override
// default CreatureAI functions which interfere with the PetAI

3
src/server/game/AI/SmartScripts/SmartAI.cpp
View File

@@ -692,6 +692,9 @@ void SmartAI::OnCharmed(bool /*isNew*/)
_charmed = charmed;
if (charmed)
me->GetMotionMaster()->MoveFollow(me->GetCharmer(), PET_FOLLOW_DIST, me->GetFollowAngle());
if (!charmed && !me->IsInEvadeMode())
{
if (_repeatWaypointPath)