[7363] Propertly set cooldown at server side for category spells at cooldown event send to client. Author: VladimirMangos

    Also support item dependent cooldown set propetly at cooldown event send to client.
    Last will used in follow potion cooldown delay in combat patch.

--HG--
branch : trunk

1 files changed, 2 insertions, 1 deletions

diff --git a/src/game/Player.h b/src/game/Player.h
index 952eaf19c02..55f789848da 100644
--- a/src/game/Player.h
+++ b/src/game/Player.h
@@ -1491,8 +1491,9 @@ class TRINITY_DLL_SPEC Player : public Unit
             time_t t = time(NULL);
             return itr != m_spellCooldowns.end() && itr->second.end > t ? itr->second.end - t : 0;
         }
+        void AddSpellAndCategoryCooldowns(SpellEntry const* spellInfo, uint32 itemId, Spell* spell = NULL);
         void AddSpellCooldown(uint32 spell_id, uint32 itemid, time_t end_time);
-        void SendCooldownEvent(SpellEntry const *spellInfo);
+        void SendCooldownEvent(SpellEntry const *spellInfo, uint32 itemId = 0, Spell* spell = NULL);
         void ProhibitSpellScholl(SpellSchoolMask idSchoolMask, uint32 unTimeMs );
         void RemoveSpellCooldown(uint32 spell_id) { m_spellCooldowns.erase(spell_id); }
         void RemoveArenaSpellCooldowns();