ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(Core/TotemAI): Totems should not attack neutral unless owner is in combat (#5434)

Browse source
This commit is contained in:
Kitzunu 2021-05-01 19:18:29 +02:00 • committed by GitHub
parent 46c9aa6f3a
commit 752595dccf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/server/game/AI/CoreAI/TotemAI.cpp
View file

@ -76,6 +76,12 @@ void TotemAI::UpdateAI(uint32 /*diff*/)
me->VisitNearbyObject(max_range, checker);
}
if (!victim && me->GetCharmerOrOwnerOrSelf()->IsInCombat())
{
victim = me->GetCharmerOrOwnerOrSelf()->GetVictim();
}
// If have target
if (victim)
{

2
src/server/game/Grids/Notifiers/GridNotifiers.h
View file

@ -931,7 +931,7 @@ namespace acore
bool operator()(Unit* u)
{
if (u->isTargetableForAttack(true, i_funit) && i_obj->IsWithinDistInMap(u, i_range) &&
!i_funit->IsFriendlyTo(u) && i_funit->CanSeeOrDetect(u))
(i_funit->IsInCombatWith(u) || i_funit->IsHostileTo(u)) && i_obj->CanSeeOrDetect(u))
{
i_range = i_obj->GetDistance(u); // use found unit range as new range limit for next check
return true;