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

*Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-02-12 17:09:15 -06:00
parent 2d2f433b4d f385747164
commit 6aee5fcbe7
603 changed files with 40989 additions and 40987 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/game/SpellHandler.cpp
View File

@@ -328,27 +328,27 @@ 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);
// 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
Aura* Aur = iter->second;
_player->m_Auras.erase(iter);
++_player->m_removedAuras; // internal count used by unit update
delete Aur;
delete Aur;
if( _player->m_Auras.empty() )
iter = _player->m_Auras.end();
else
iter = _player->m_Auras.begin();
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))