Changeset 251 for trunk/src/game/SpellHandler.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/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());
-    }
 }