Changeset 252 for trunk/src/game/SpellHandler.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/SpellHandler.cpp (modified) (1 diff)

trunk/src/game/SpellHandler.cpp

@@ -378 +378 @@
         return;
 
-    // channeled spell case (it currently casted then)
-    if(IsChanneledSpell(spellInfo))
-    {
-        if(Spell* spell = _player->m_currentSpells[CURRENT_CHANNELED_SPELL])
-        {
-            if(spell->m_spellInfo->Id==spellId)
-            {
-                spell->cancel();
-                spell->SetReferencedFromCurrent(false);
-                _player->m_currentSpells[CURRENT_CHANNELED_SPELL] = NULL;
-            }
-        }
-        return;
-    }
-
-    // non channeled case
     _player->RemoveAurasDueToSpellByCancel(spellId);
+
+    if (spellId == 2584)                                    // Waiting to resurrect spell cancel, we must remove player from resurrect queue
+    {
+        BattleGround *bg = _player->GetBattleGround();
+        if(!bg)
+            return;
+        bg->RemovePlayerFromResurrectQueue(_player->GetGUID());
+    }
 }