Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-17 08:00:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Allow to proc when aura is cancelled.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-03-24 16:46:54 -06:00
parent c5969d6d03
commit 4d982bfca4
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/game/SpellAuras.cpp
View File

@@ -1022,9 +1022,10 @@ void Aura::_RemoveAura()
((Player*)caster)->SendCooldownEvent(GetSpellProto());
}
// overkill
// do not proc anything if aura is cancelled
if(m_removeMode == AURA_REMOVE_BY_CANCEL)
return;
//if(m_removeMode == AURA_REMOVE_BY_CANCEL)
// return;
// Remove Linked Auras (on last aura remove)
uint32 id = GetId();
@@ -1063,7 +1064,7 @@ void Aura::_RemoveAura()
uint32 procEx=0;
if (m_removeMode == AURA_REMOVE_BY_ENEMY_SPELL)
procEx = PROC_EX_AURA_REMOVE_DESTROY;
else if (m_removeMode == AURA_REMOVE_BY_DEFAULT)// || m_removeMode == AURA_REMOVE_BY_CANCEL)
else if (m_removeMode == AURA_REMOVE_BY_DEFAULT || m_removeMode == AURA_REMOVE_BY_CANCEL)
procEx = PROC_EX_AURA_REMOVE_EXPIRE;
caster->ProcDamageAndSpell(m_target,ProcCaster, ProcVictim, procEx, m_modifier.m_amount, BASE_ATTACK, m_spellProto);