diff options
| author | QAston <none@none> | 2009-04-15 20:58:39 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-04-15 20:58:39 +0200 |
| commit | 8ca97f7bcbb7cc8d20eeefe2ee3c6646542ae6cb (patch) | |
| tree | a7a3ea000ac523ef1111b5bc909ef141a7e7c958 /src/game/SpellAuras.cpp | |
| parent | fcbdb1012212fee36f67dee764efb089f4e40584 (diff) | |
Backed out changeset 77ac33a3948b - it caused problems with some channeled spells (interruption)
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellAuras.cpp')
| -rw-r--r-- | src/game/SpellAuras.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 955539b4c53..5fedc013188 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -935,8 +935,7 @@ void Aura::_AddAura() // set infinity cooldown state for spells if(caster && caster->GetTypeId() == TYPEID_PLAYER) { - // Do not apply cooldown for caster passive spells (needed by Reincarnation) - if (!(caster->HasSpell(GetId()) && IsPassive()) && !(m_spellProto->Attributes & SPELL_ATTR_DISABLED_WHILE_ACTIVE)) + if (m_spellProto->Attributes & SPELL_ATTR_DISABLED_WHILE_ACTIVE) { Item* castItem = m_castItemGuid ? ((Player*)caster)->GetItemByGuid(m_castItemGuid) : NULL; ((Player*)caster)->AddSpellAndCategoryCooldowns(m_spellProto,castItem ? castItem->GetEntry() : 0, NULL,true); |