aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormegamage <none@none>2009-03-15 17:20:49 -0600
committermegamage <none@none>2009-03-15 17:20:49 -0600
commit133a1f2d3392ab36531e3a123f5d8b7f033c5e91 (patch)
tree7369e0e0878bf6ba2e1ba126a7d6f78a64efd8df /src
parent596e9b353ae8dc6e4b0b0347cc450e4beaf2f0ab (diff)
[7462] Lost part of "[7456] Batter check for items with delayed cooldown.". Author: VladimirMangos
Now not only mana/health potion will restore cooldown counting at combat end. --HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/Spell.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 11b1ab94bc7..7ecf1ff4b8d 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -2620,8 +2620,8 @@ void Spell::finish(bool ok)
m_caster->resetAttackTimer(RANGED_ATTACK);
}
- // mana/health potions, disabled by client, send event "not in combat"
- if (m_caster->GetTypeId() == TYPEID_PLAYER && m_spellInfo->Category == SPELLCATEGORY_HEALTH_MANA_POTIONS)
+ // potions disabled by client, send event "not in combat" if need
+ if (m_caster->GetTypeId() == TYPEID_PLAYER)
((Player*)m_caster)->UpdatePotionCooldown(this);
// call triggered spell only at successful cast (after clear combo points -> for add some if need)