diff options
| author | Blaymoira <none@none> | 2009-03-08 09:01:00 +0100 |
|---|---|---|
| committer | Blaymoira <none@none> | 2009-03-08 09:01:00 +0100 |
| commit | 3c1fff341d07b891f386fa40dbdf25fcfb565c5f (patch) | |
| tree | 00c17ce409183e581e1766bbabfe754c3b539c09 /src/game/Unit.cpp | |
| parent | ae7078784366172e27d2fe0ac4b18345b628fd3f (diff) | |
| parent | 658568a8e2eb749ea974b45e09b7e2775d6e0c69 (diff) | |
*Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 7bdb3b28d27..6c75903072f 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -4706,13 +4706,10 @@ void Unit::RemoveAura(AuraMap::iterator &i, AuraRemoveMode mode) if(!caster) // can be already located for IsSingleTargetSpell case caster = Aur->GetCaster(); - if(caster) + if(caster && caster->isAlive()) { - if(caster->GetTypeId()==TYPEID_UNIT && ((Creature*)caster)->isTotem() && ((Totem*)caster)->GetTotemType()==TOTEM_STATUE) - statue = ((Totem*)caster); - // stop caster chanelling state - else if(caster->m_currentSpells[CURRENT_CHANNELED_SPELL] + if(caster->m_currentSpells[CURRENT_CHANNELED_SPELL] //prevent recurential call && caster->m_currentSpells[CURRENT_CHANNELED_SPELL]->getState() != SPELL_STATE_FINISHED) { @@ -4727,6 +4724,9 @@ void Unit::RemoveAura(AuraMap::iterator &i, AuraRemoveMode mode) caster->m_currentSpells[CURRENT_CHANNELED_SPELL]->cancel(); } } + + if(caster->GetTypeId()==TYPEID_UNIT && ((Creature*)caster)->isTotem() && ((Totem*)caster)->GetTotemType()==TOTEM_STATUE) + statue = ((Totem*)caster); } // Unsummon summon as possessed creatures on spell cancel |