*Do not proc anything when aura is removed by cancel.

*Remove aura by cancel when duel complete. This fix a crash.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-03-23 16:34:30 -06:00
parent e9fb303e36
commit a8105dcff6
3 changed files with 8 additions and 26 deletions

View File

@@ -325,28 +325,6 @@ void WorldSession::HandleCancelAuraOpcode( WorldPacket& recvPacket)
if(!IsPositiveSpell(spellId) || (spellInfo->Attributes & SPELL_ATTR_CANT_CANCEL))
return;
// lifebloom must delete final heal effect
if (spellInfo->SpellFamilyName == SPELLFAMILY_DRUID && (spellInfo->SpellFamilyFlags[1] & 0x10) )
{
Unit::AuraMap::iterator iter;
while((iter = _player->m_Auras.find(Unit::spellEffectPair(spellId, 1))) != _player->m_Auras.end())
{
_player->m_modAuras[SPELL_AURA_DUMMY].remove(iter->second);
Aura* Aur = iter->second;
_player->m_Auras.erase(iter);
++_player->m_removedAuras; // internal count used by unit update
delete Aur;
if( _player->m_Auras.empty() )
iter = _player->m_Auras.end();
else
iter = _player->m_Auras.begin();
}
}
// channeled spell case (it currently casted then)
if(IsChanneledSpell(spellInfo))
{