*Fix build.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-04-08 13:37:11 -05:00
parent 74d553bc4c
commit ce9211a5bc
5 changed files with 10 additions and 14 deletions
+1 -1
View File
@@ -2225,7 +2225,7 @@ void Spell::cancel()
return;
SetReferencedFromCurrent(false);
if(m_selfContainer)
if(m_selfContainer && *m_selfContainer == this)
*m_selfContainer = NULL;
uint32 oldState = m_spellState;
+1 -4
View File
@@ -3218,10 +3218,7 @@ void Unit::_DeleteAuras()
{
// remove auras only for non-aoe spells or when chanelled aura is removed
// because aoe spells don't require aura on target to continue
{
caster->m_currentSpells[CURRENT_CHANNELED_SPELL]->cancel();
caster->m_currentSpells[CURRENT_CHANNELED_SPELL]=NULL;
}
caster->m_currentSpells[CURRENT_CHANNELED_SPELL]->cancel();
}
if(caster->GetTypeId()==TYPEID_UNIT && ((Creature*)caster)->isTotem() && ((Totem*)caster)->GetTotemType()==TOTEM_STATUE)