nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-27 07:36:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Pets): Manual using pet spell should not reset attack command. (#9635)

Browse Source 
Fixes #9632
This commit is contained in:
UltraNix
2022-01-16 20:44:21 +01:00
committed by GitHub
parent d3956f3142
commit 19b68ffb57
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/game/Entities/Pet/Pet.cpp
View File

@@ -727,6 +727,8 @@ void Pet::Update(uint32 diff)
GetMotionMaster()->Clear(false);
GetMotionMaster()->MoveIdle();
bool oldCmdAttack = GetCharmInfo()->IsCommandAttack();
GetCharmInfo()->SetIsCommandAttack(false);
GetCharmInfo()->SetIsAtStay(true);
GetCharmInfo()->SetIsCommandFollow(false);
@@ -734,6 +736,8 @@ void Pet::Update(uint32 diff)
GetCharmInfo()->SetIsReturning(false);
GetCharmInfo()->SaveStayPosition(true);
GetCharmInfo()->SetIsCommandAttack(oldCmdAttack);
AddSpellCooldown(tempspell, 0, spellInfo->IsCooldownStartedOnEvent() ? infinityCooldownDelay : 0);
CastSpell(tempspellTarget, tempspell, false);

4
src/server/game/Entities/Unit/Unit.cpp
View File

@@ -19652,7 +19652,7 @@ void Unit::PetSpellFail(const SpellInfo* spellInfo, Unit* target, uint32 result)
{
AttackStop();
charmInfo->SetIsAtStay(false);
charmInfo->SetIsCommandAttack(!ToCreature()->HasReactState(REACT_PASSIVE));
charmInfo->SetIsCommandAttack(true);
charmInfo->SetIsReturning(false);
charmInfo->SetIsFollowing(false);
@@ -19662,7 +19662,7 @@ void Unit::PetSpellFail(const SpellInfo* spellInfo, Unit* target, uint32 result)
{
AttackStop();
charmInfo->SetIsAtStay(false);
charmInfo->SetIsCommandAttack(!ToCreature()->HasReactState(REACT_PASSIVE));
charmInfo->SetIsCommandAttack(true);
charmInfo->SetIsReturning(false);
charmInfo->SetIsFollowing(false);