diff options
| -rwxr-xr-x | src/server/game/Entities/Player/Player.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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); |