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

Timestamp:

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

Author:

yumileroy

Message:

Backed out changeset 8fba4a7e4268

Original author: KingPin? <KingPin?@Trinitycore.org>
Date: 2008-11-17 22:07:07-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
@@ -2017 +2007 @@
                 m_target->DealDamage(m_target, m_target->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
             return;
-        }*/
+        }
 
         // Burning Winds