nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-04 19:43:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Totems): Searing Totem will properly attack neutral targets. (#7157)

Browse Source 
Fixed #6310

Co-authored-by: Stefano Borzì <stefanoborzi32@gmail.com>
This commit is contained in:
UltraNix
2021-08-05 15:15:12 +02:00
committed by GitHub
parent 36a1777b99
commit ed4cfd37f4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/AI/CoreAI/TotemAI.cpp
View File

@@ -78,7 +78,7 @@ void TotemAI::UpdateAI(uint32 /*diff*/)
if (!victim && me->GetCharmerOrOwnerOrSelf()->IsInCombat()) if (!victim && me->GetCharmerOrOwnerOrSelf()->IsInCombat())
{ {
victim = me->GetCharmerOrOwnerOrSelf()->GetVictim(); victim = me->GetCharmerOrOwnerOrSelf()->getAttackerForHelper();
} }
// If have target // If have target

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

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