From e0b527be8ac4723a14b2cd5623aa511681f11775 Mon Sep 17 00:00:00 2001 From: QAston Date: Wed, 21 Jan 2009 20:24:21 +0100 Subject: [PATCH] *Fix rain of fire. --HG-- branch : trunk --- src/game/Unit.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 813d778324..d46d77f870 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -4660,8 +4660,13 @@ void Unit::RemoveAura(AuraMap::iterator &i, AuraRemoveMode mode) //prevent recurential call && caster->m_currentSpells[CURRENT_CHANNELED_SPELL]->getState() != SPELL_STATE_FINISHED) { - caster->m_currentSpells[CURRENT_CHANNELED_SPELL]->cancel(false); - channeled = true; + if (caster==this || !IsAreaOfEffectSpell(AurSpellInfo)) + { + // 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(false); + channeled = true; + } } } }