From 92a7d02184a1fcf8ab160c2ff895e654bf371567 Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Sun, 21 Nov 2010 16:48:08 +0100 Subject: Core/Player: Invoke global cooldown when equipping relic slot items during combat. Please report any issues you find regarding this changeset. --HG-- branch : trunk --- src/server/game/Entities/Player/Player.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 2116b0b3e05..b6567dfb7fb 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -11694,7 +11694,7 @@ Item* Player::EquipItem(uint16 pos, Item *pItem, bool update) _ApplyItemMods(pItem, slot, true); - if (pProto && isInCombat()&& pProto->Class == ITEM_CLASS_WEAPON && m_weaponChangeTimer == 0) + if (pProto && isInCombat() && (pProto->Class == ITEM_CLASS_WEAPON || pProto->InventoryType == INVTYPE_RELIC) && m_weaponChangeTimer == 0) { uint32 cooldownSpell = 6119; @@ -11709,6 +11709,8 @@ Item* Player::EquipItem(uint16 pos, Item *pItem, bool update) { m_weaponChangeTimer = spellProto->StartRecoveryTime; + CastSpell(this, cooldownSpell, false); // Needed for server side GCD + WorldPacket data(SMSG_SPELL_COOLDOWN, 8+1+4); data << uint64(GetGUID()); data << uint8(1); -- cgit v1.2.3