sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Core/PetAI): Combat spells should be casted when pet starts attack. (#9845)

Browse Source 
Fixes #2140
This commit is contained in:
UltraNix
2022-01-20 07:51:36 +01:00
committed by GitHub
parent 4464428ab8
commit 144c797dba
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/AI/CoreAI/PetAI.cpp
+3 -1
View File
@@ -252,9 +252,11 @@ void PetAI::UpdateAI(uint32 diff)
if (spellInfo->CanBeUsedInCombat()) if (spellInfo->CanBeUsedInCombat())
{ {
// Check if we're in combat or commanded to attack (exlude auras with infinity duration) // Check if we're in combat or commanded to attack (exlude auras with infinity duration)
if (!me->IsInCombat() && !me->GetCharmInfo()->IsCommandAttack() && spellInfo->GetMaxDuration() != -1) if (!me->IsInCombat() && spellInfo->GetMaxDuration() != -1 && !me->IsPetInCombat())
{
continue; continue;
} }
}
Spell* spell = new Spell(me, spellInfo, TRIGGERED_NONE); Spell* spell = new Spell(me, spellInfo, TRIGGERED_NONE);
spell->LoadScripts(); // xinef: load for CanAutoCast (calling CheckPetCast) spell->LoadScripts(); // xinef: load for CanAutoCast (calling CheckPetCast)