*Merge.

--HG-- branch : trunk
2009-03-26 21:54:14 -06:00
parent cd7376c706 52a5c5e8e3
commit e9bdfa4d02
4 changed files with 19 additions and 18 deletions
@@ -4393,7 +4393,7 @@ void Unit::RemoveAura(AuraMap::iterator &i, AuraRemoveMode mode)
    // Statue unsummoned at aura remove
    Totem* statue = NULL;
    bool channeled = false;
-    if(Aur->GetAuraDuration() && IsChanneledSpell(AurSpellInfo))
+    if(Aur->GetAuraDuration() && !Aur->IsPersistent() && IsChanneledSpell(AurSpellInfo))
    {
        if(!caster)                                         // can be already located for IsSingleTargetSpell case
            caster = Aur->GetCaster();