diff options
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 0f5d7a13ce2..0c55e133264 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -2972,7 +2972,7 @@ void Spell::prepare(SpellCastTargets const* targets, AuraEffect const* triggered m_caster->ToPlayer()->SetSpellModTakingSpell(this, false); // Set combo point requirement - if ((_triggeredCastFlags & TRIGGERED_IGNORE_COMBO_POINTS) || m_CastItem || !m_caster->m_movedPlayer) + if ((_triggeredCastFlags & TRIGGERED_IGNORE_COMBO_POINTS) || m_CastItem || !m_caster->m_playerMovingMe) m_needComboPoints = false; SpellCastResult result = CheckCast(true); @@ -3552,15 +3552,15 @@ void Spell::_handle_immediate_phase() void Spell::_handle_finish_phase() { - if (m_caster->m_movedPlayer) + if (m_caster->m_playerMovingMe) { // Take for real after all targets are processed if (m_needComboPoints) - m_caster->m_movedPlayer->ClearComboPoints(); + m_caster->m_playerMovingMe->ClearComboPoints(); // Real add combo points from effects if (m_comboPointGain) - m_caster->m_movedPlayer->GainSpellComboPoints(m_comboPointGain); + m_caster->m_playerMovingMe->GainSpellComboPoints(m_comboPointGain); } if (m_caster->m_extraAttacks && HasEffect(SPELL_EFFECT_ADD_EXTRA_ATTACKS)) |