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

fix(Core/Pets): controllable guardians (including pets) should not set the combat with its target when commanded to attack it (#7315)

Browse source 
- Closes #7264
This commit is contained in:
UltraNix 2021-08-16 17:43:56 +02:00 • committed by GitHub
parent 0e70a11b83
commit 3fa1aa1c17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/server/game/Entities/Unit/Unit.cpp
View file

@ -9862,7 +9862,7 @@ bool Unit::Attack(Unit* victim, bool meleeAttack)
//if (GetTypeId() == TYPEID_UNIT)
// ToCreature()->SetCombatStartPosition(GetPositionX(), GetPositionY(), GetPositionZ());
if (creature && !IsPet())
if (creature && !IsControllableGuardian())
{
// should not let player enter combat by right clicking target - doesn't helps
SetInCombatWith(victim);