[8056] Move SMSG_CLEAR_COOLDOWN into function and use it. Other cleanups. Author:XTZGZoReX

[8060] Store spell_pet_auras for auraeffects instead of by whole aura Author:hunuza.

--HG--
branch : trunk

1 files changed, 3 insertions, 3 deletions

diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp
index 3960b59d6d4..3dc7c6d4ff1 100644
--- a/src/game/PetHandler.cpp
+++ b/src/game/PetHandler.cpp
@@ -291,7 +291,7 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
                     pet->SendPetCastFail(spellid, result);
 
                 if(!((Creature*)pet)->HasSpellCooldown(spellid))
-                    pet->SendPetClearCooldown(spellid);
+                    GetPlayer()->SendClearCooldown(spellid, pet);
 
                 spell->finish(false);
                 delete spell;
@@ -669,12 +669,12 @@ void WorldSession::HandlePetCastSpellOpcode( WorldPacket& recvPacket )
         if(caster->GetTypeId() == TYPEID_PLAYER)
         {
             if(!((Player*)caster)->HasSpellCooldown(spellid))
-                caster->SendPetClearCooldown(spellid);
+                GetPlayer()->SendClearCooldown(spellid, caster);
         }
         else
         {
             if(!((Creature*)caster)->HasSpellCooldown(spellid))
-                caster->SendPetClearCooldown(spellid);
+                GetPlayer()->SendClearCooldown(spellid, caster);
         }
 
         spell->finish(false);