*Fix fishing and Eagle eye.

--HG-- branch : trunk
2009-01-22 20:48:08 +01:00
parent 405b07855c
commit 18cc905c42
1 changed files with 7 additions and 2 deletions
@@ -4673,8 +4673,13 @@ void Unit::RemoveAura(AuraMap::iterator &i, AuraRemoveMode mode)
                {
                    // 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;
+                    if (AurSpellInfo->EffectApplyAuraName[Aur->GetEffIndex()]!=SPELL_AURA_PERIODIC_DUMMY 
+                        && AurSpellInfo->EffectApplyAuraName[Aur->GetEffIndex()]!= SPELL_AURA_DUMMY)
+                        //don't stop channeling of scripted spells (this is actually a hack)
+                    {
+                        caster->m_currentSpells[CURRENT_CHANNELED_SPELL]->cancel(false);
+                        channeled = true;
+                    }
                }
            }
        }