diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2016-09-02 08:59:14 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-02-18 18:07:07 +0100 |
| commit | 255dd29562ae42a73c5947c2a8907faac888af31 (patch) | |
| tree | 66970410e3dfafab9c1cbb12572fe664e90e4451 /src/server/game/Spells/Spell.cpp | |
| parent | ced908d835654f3e1d4172a37bebbb219ef92851 (diff) | |
Core/Spell: no need to bloat existing parameter lists. (f81754a306a8b1f24f0b130ded3c8170e9b146c5 follow up)
(cherry picked from commit 4829cca9fb81b27cd9a057355ee7b03ff71e0a14)
Note to self: drycoding is bad
(cherry picked from commit 7e8a08c3516d8f5e48882a01a2ccdb8881dd8283)
Another build fix.
(it was probably better to just revert the commit instead)
(cherry picked from commit be8d1136994fd5f0a90b03a52d21c9503857f15f)
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 5f1149c2ffc..33c0afb5829 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -7030,7 +7030,13 @@ void Spell::DoAllEffectOnLaunchTarget(TargetInfo& targetInfo, float* multiplier) } } - targetInfo.crit = m_caster->IsSpellCrit(unit, m_spellInfo, m_spellSchoolMask, m_attackType, this); + if (Player* modOwner = m_caster->GetSpellModOwner()) + modOwner->SetSpellModTakingSpell(this, true); + + targetInfo.crit = m_caster->IsSpellCrit(unit, m_spellInfo, m_spellSchoolMask, m_attackType); + + if (Player* modOwner = m_caster->GetSpellModOwner()) + modOwner->SetSpellModTakingSpell(this, false); } SpellCastResult Spell::CanOpenLock(uint32 effIndex, uint32 lockId, SkillType& skillId, int32& reqSkillValue, int32& skillValue) |