From 3da672f66f3adb43b9cf50640607206635ce240b Mon Sep 17 00:00:00 2001 From: Feanordev Date: Mon, 6 Jun 2011 14:58:59 +0400 Subject: [PATCH] [11614] Totem/Relic/Sigil etc swapping should tirgger GCD Signed-off-by: VladimirMangos --- src/game/Player.cpp | 3 ++- src/shared/revision_nr.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/game/Player.cpp b/src/game/Player.cpp index a3536a7bc99..fd569be650a 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -11217,7 +11217,8 @@ Item* Player::EquipItem( uint16 pos, Item *pItem, bool update ) _ApplyItemMods(pItem, slot, true); - if(pProto && isInCombat()&& pProto->Class == ITEM_CLASS_WEAPON && m_weaponChangeTimer == 0) + // Weapons and also Totem/Relic/Sigil/etc + if (pProto && isInCombat() && (pProto->Class == ITEM_CLASS_WEAPON || pProto->InventoryType == INVTYPE_RELIC) && m_weaponChangeTimer == 0) { uint32 cooldownSpell = SPELL_ID_WEAPON_SWITCH_COOLDOWN_1_5s; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 3df7d21c7e7..f7cd1439ba3 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11613" + #define REVISION_NR "11614" #endif // __REVISION_NR_H__