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

*Fix Slice and Dice and other multitarget spells using combopoints in effects.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
QAston
2009-04-09 00:54:08 +02:00
parent e3272f2b0a
commit 31a0ffa4ca
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/game/Spell.cpp
View File

@@ -1022,14 +1022,6 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
caster->ProcDamageAndSpell(unit, procAttacker, procVictim, procEx, 0, m_attackType, m_spellInfo);
}
// Take combo points after effects handling (combo points are used in effect handling)
if(!m_IsTriggeredSpell && !m_CastItem
&& NeedsComboPoints(m_spellInfo)
&& m_caster->GetTypeId()==TYPEID_PLAYER
&& target->targetGUID == m_targets.getUnitTargetGUID()
&& (missInfo == SPELL_MISS_NONE || missInfo == SPELL_MISS_MISS))
((Player*)m_caster)->ClearComboPoints();
// Call scripted function for AI if this spell is casted upon a creature (except pets)
if(IS_CREATURE_GUID(target->targetGUID))
{
@@ -2426,8 +2418,23 @@ void Spell::handle_immediate()
// process immediate effects (items, ground, etc.) also initialize some variables
_handle_immediate_phase();
bool checkCp =
!m_IsTriggeredSpell && !m_CastItem
&& NeedsComboPoints(m_spellInfo)
&& m_caster->GetTypeId()==TYPEID_PLAYER;
bool comboPoints = false;
for(std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin();ihit != m_UniqueTargetInfo.end();++ihit)
{
DoAllEffectOnTarget(&(*ihit));
// Take combo points after effects handling (combo points are used in effect handling)
if(checkCp)
if(ihit->targetGUID == m_targets.getUnitTargetGUID()
&& (ihit->missCondition == SPELL_MISS_NONE || ihit->missCondition == SPELL_MISS_MISS))
comboPoints=true;
}
// Take for real after all targets are processed
if (comboPoints)
((Player*)m_caster)->ClearComboPoints();
for(std::list<GOTargetInfo>::iterator ihit= m_UniqueGOTargetInfo.begin();ihit != m_UniqueGOTargetInfo.end();++ihit)
DoAllEffectOnTarget(&(*ihit));