From ac4bab545197f9fb393d7225d5c3d6597871978a Mon Sep 17 00:00:00 2001
From: thenecromancer <none@none>
Date: Wed, 13 Jan 2010 10:03:09 +0100
Subject: Allow pet cast spells unaffected by global cooldown, while global
 cooldown is active

--HG--
branch : trunk
---
 src/game/PetHandler.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/game/PetHandler.cpp')

diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp
index ee8c02dfb43..1ffe4bc1632 100644
--- a/src/game/PetHandler.cpp
+++ b/src/game/PetHandler.cpp
@@ -224,8 +224,6 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
         case ACT_ENABLED:                                   // 0xC1    spell
         {
             Unit* unit_target = NULL;
-            if (((Creature*)pet)->GetGlobalCooldown() > 0)
-                return;
 
             if(guid2)
                 unit_target = ObjectAccessor::GetUnit(*_player,guid2);
@@ -238,6 +236,10 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
                 return;
             }
 
+            if (spellInfo->StartRecoveryCategory > 0)
+                if (((Creature*)pet)->GetGlobalCooldown() > 0)
+                    return;
+
             for (uint32 i = 0; i < 3; ++i)
             {
                 if(spellInfo->EffectImplicitTargetA[i] == TARGET_UNIT_AREA_ENEMY_SRC || spellInfo->EffectImplicitTargetA[i] == TARGET_UNIT_AREA_ENEMY_DST || spellInfo->EffectImplicitTargetA[i] == TARGET_DEST_DYNOBJ_ENEMY)
-- 
cgit v1.2.3