Merge pull request #15140 from RelevantJesse/6.x

[Core/Pet] Spellcooldown in UpdateAI

1 files changed, 4 insertions, 4 deletions

diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp
index 2bf31a8be06..46a0342fea5 100644
--- a/src/server/game/AI/CoreAI/PetAI.cpp
+++ b/src/server/game/AI/CoreAI/PetAI.cpp
@@ -148,15 +148,15 @@ void PetAI::UpdateAI(uint32 diff)
 
             if (me->GetCharmInfo() && me->GetSpellHistory()->HasGlobalCooldown(spellInfo))
                 continue;
+    
+            // check spell cooldown
+            if (!me->GetSpellHistory()->IsReady(spellInfo))
+                continue;
 
             if (spellInfo->IsPositive())
             {
                 if (spellInfo->CanBeUsedInCombat())
                 {
-                    // check spell cooldown
-                    if (!me->GetSpellHistory()->IsReady(spellInfo))
-                        continue;
-
                     // Check if we're in combat or commanded to attack
                     if (!me->IsInCombat() && !me->GetCharmInfo()->IsCommandAttack())
                         continue;