diff options
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 8cc94e2f59d..01a42a8ccd0 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -3624,8 +3624,6 @@ void Spell::cancel() SendChannelUpdate(0, SPELL_FAILED_INTERRUPTED); SendInterrupted(0); SendCastResult(SPELL_FAILED_INTERRUPTED); - - m_appliedMods.clear(); break; default: break; @@ -3894,7 +3892,7 @@ void Spell::_cast(bool skipCheck) } if (m_scriptResult && !m_scriptWaitsForSpellHit) - m_scriptResult->SetResult(SPELL_CAST_OK); + m_scriptResult.SetResult(SPELL_CAST_OK); CallScriptAfterCastHandlers(); @@ -4383,7 +4381,7 @@ void Spell::finish(SpellCastResult result) m_spellState = SPELL_STATE_FINISHED; if (m_scriptResult && (m_scriptWaitsForSpellHit || result != SPELL_CAST_OK)) - m_scriptResult->SetResult(result); + m_scriptResult.SetResult(result); if (!m_caster) return; @@ -5090,7 +5088,7 @@ static std::pair<int32, SpellHealPredictionType> CalcPredictedHealing(SpellInfo case SPELL_AURA_OBS_MOD_HEALTH: points += unitCaster->SpellHealingBonusDone(target, spellInfo, spellEffectInfo.CalcValue(unitCaster, nullptr, target, nullptr, castItemEntry, castItemLevel), - DIRECT_DAMAGE, spellEffectInfo, 1, spell) * spellInfo->GetMaxTicks(); + DIRECT_DAMAGE, spellEffectInfo, 1, spell) * spellEffectInfo.GetPeriodicTickCount(); break; case SPELL_AURA_PERIODIC_TRIGGER_SPELL: if (SpellInfo const* triggered = sSpellMgr->GetSpellInfo(spellEffectInfo.TriggerSpell, spellInfo->Difficulty)) |