Changeset 251 for trunk/src/game/SpellAuras.cpp

Timestamp:

11/19/08 13:50:51 (17 years ago)

Author:

yumileroy

Message:

*Merge from Mangos
*[6833] More correct aura cancel for channeled spells. By VladimirMangos?.
*[6820] Cleanup spell proc event code. Avoid send same information by 2 ways to function. By VladimirMangos?.

Original author: megamage
Date: 2008-11-17 19:39:24-06:00

Files:

• trunk/src/game/SpellAuras.cpp (modified) (2 diffs)

trunk/src/game/SpellAuras.cpp

@@ -2000 +2000 @@
         }
 
+        // Waiting to Resurrect
+        if(GetId()==2584)
+        {
+            // Waiting to resurrect spell cancel, we must remove player from resurrect queue
+            if(m_target->GetTypeId() == TYPEID_PLAYER)
+                if(BattleGround *bg = ((Player*)m_target)->GetBattleGround())
+                    bg->RemovePlayerFromResurrectQueue(m_target->GetGUID());
+            return;
+        }
+
         // Dark Fiend
-        if(GetId()==45934)
+        /*if(GetId()==45934)
         {
             // Kill target if dispelled
@@ -2007 +2017 @@
                 m_target->DealDamage(m_target, m_target->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
             return;
-        }
+        }*/
 
         // Burning Winds