josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Fix a crash caused by spell target type channelled target. Thanks to nanouniko

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-09-02 12:11:01 -05:00
parent b0e15b8b23
commit c150629f8d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Spell.cpp
+3 -2
View File
@@ -2140,7 +2140,8 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
switch(cur) switch(cur)
{ {
case TARGET_UNIT_CHANNEL: case TARGET_UNIT_CHANNEL:
if(Unit* target = m_originalCaster->GetCurrentSpell(CURRENT_CHANNELED_SPELL)->m_targets.getUnitTarget()) // in some cases unittarget is invalid and crash. do not know why it happens.
if(Unit* target = Unit::GetUnit(*m_caster, m_originalCaster->GetCurrentSpell(CURRENT_CHANNELED_SPELL)->m_targets.getUnitTargetGUID()))
AddUnitTarget(target, i); AddUnitTarget(target, i);
else else
sLog.outError( "SPELL: cannot find channel spell target for spell ID %u", m_spellInfo->Id ); sLog.outError( "SPELL: cannot find channel spell target for spell ID %u", m_spellInfo->Id );
@@ -2148,7 +2149,7 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
case TARGET_DEST_CHANNEL: case TARGET_DEST_CHANNEL:
if(m_originalCaster->GetCurrentSpell(CURRENT_CHANNELED_SPELL)->m_targets.HasDst()) if(m_originalCaster->GetCurrentSpell(CURRENT_CHANNELED_SPELL)->m_targets.HasDst())
m_targets = m_originalCaster->GetCurrentSpell(CURRENT_CHANNELED_SPELL)->m_targets; m_targets = m_originalCaster->GetCurrentSpell(CURRENT_CHANNELED_SPELL)->m_targets;
else if(Unit* target = m_originalCaster->GetCurrentSpell(CURRENT_CHANNELED_SPELL)->m_targets.getUnitTarget()) else if(Unit* target = Unit::GetUnit(*m_caster, m_originalCaster->GetCurrentSpell(CURRENT_CHANNELED_SPELL)->m_targets.getUnitTargetGUID()))
m_targets.setDst(target); m_targets.setDst(target);
else else
sLog.outError( "SPELL: cannot find channel spell destination for spell ID %u", m_spellInfo->Id ); sLog.outError( "SPELL: cannot find channel spell destination for spell ID %u", m_spellInfo->Id );