Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-06 00:48:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Fix some broken charge spells.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-02-02 17:20:30 -06:00
parent 8b8d722523
commit 8dfe8cd64a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/game/Spell.cpp
View File

@@ -2206,9 +2206,6 @@ void Spell::cast(bool skipCheck)
FillTargetMap();
if(m_customAttr & SPELL_ATTR_CU_DIRECT_DAMAGE)
CalculateDamageDoneForAllTargets();
// traded items have trade slot instead of guid in m_itemTargetGUID
// set to real guid to be sent later to the client
m_targets.updateTradeSlotItem();
@@ -2231,12 +2228,15 @@ void Spell::cast(bool skipCheck)
SendCastResult(castResult);
SendSpellGo(); // we must send smsg_spell_go packet before m_castItem delete in TakeCastItem()...
if(m_customAttr & SPELL_ATTR_CU_DIRECT_DAMAGE)
CalculateDamageDoneForAllTargets();
if(m_customAttr & SPELL_ATTR_CU_CHARGE)
EffectCharge(0);
// Okay, everything is prepared. Now we need to distinguish between immediate and evented delayed spells
if (m_spellInfo->speed > 0.0f && !IsChanneledSpell(m_spellInfo))
{
if(m_customAttr & SPELL_ATTR_CU_CHARGE)
EffectCharge(0);
// Remove used for cast item if need (it can be already NULL after TakeReagents call
// in case delayed spell remove item at cast delay start
TakeCastItem();