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: minimize further undesired behaviours (e3e4b97 followup)

Browse Source 
Those Category checks come from checking all Spell::SummonGuardian uses
This commit is contained in:
ccrs
2019-06-24 12:49:15 +02:00
parent e3e4b975ce
commit ebd438883e
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/server/game/AI/CreatureAI.cpp
View File

@@ -21,6 +21,7 @@
#include "Creature.h"
#include "CreatureAIImpl.h"
#include "CreatureTextMgr.h"
#include "DBCStructure.h"
#include "Language.h"
#include "Log.h"
#include "Map.h"
@@ -153,13 +154,22 @@ void CreatureAI::TriggerAlert(Unit const* who) const
void CreatureAI::JustAppeared()
{
if (!me->GetVehicle())
// Filter which type of summons apply the following follow handling
if (!me->IsSummon())
return;
TempSummon* summon = me->ToTempSummon();
if (summon->m_Properties->Category != SUMMON_CATEGORY_UNK && summon->m_Properties->Category != SUMMON_CATEGORY_PET)
return;
// Not applied to vehicles
if (summon->GetVehicle())
return;
if (Unit* owner = summon->GetCharmerOrOwner())
{
if (Unit* owner = me->GetCharmerOrOwner())
{
me->GetMotionMaster()->Clear();
me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, me->GetFollowAngle());
}
summon->GetMotionMaster()->Clear();
summon->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, summon->GetFollowAngle());
}
}