diff options
| author | megamage <none@none> | 2008-10-29 18:06:01 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2008-10-29 18:06:01 -0500 |
| commit | 7ea14f94f1e9c2fa3483b4dd3526cd5d67e45161 (patch) | |
| tree | 007e6bc047810a1891e0c916b0d77ad4a943861e /src/game/PetHandler.cpp | |
| parent | cca2c3a6039227c844baef246939e2f393d5090d (diff) | |
[svn] Merge from mangos.
Wed Oct 29 15:06:00 http://github.com/mangos/mangos/commit/034b8a34a9b621443e97d0ac4b667b603ba31ef1
Mon Oct 27 14:36:42 http://github.com/mangos/mangos/commit/fa072d15107b44344af8c9ef686839984e241a1b
--HG--
branch : trunk
Diffstat (limited to 'src/game/PetHandler.cpp')
| -rw-r--r-- | src/game/PetHandler.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp index b8e96cf3a75..e9f860c7207 100644 --- a/src/game/PetHandler.cpp +++ b/src/game/PetHandler.cpp @@ -166,6 +166,9 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data ) else unit_target = NULL; + if (((Creature*)pet)->GetGlobalCooldown() > 0) + return; + // do not cast unknown spells SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellid ); if(!spellInfo) @@ -601,6 +604,9 @@ void WorldSession::HandleAddDynamicTargetObsoleteOpcode( WorldPacket& recvPacket return; } + if (pet->GetGlobalCooldown() > 0) + return; + SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellid); if(!spellInfo) { |