From 27a830449e471c804fa08939c303a1c64b233e42 Mon Sep 17 00:00:00 2001 From: killerwife Date: Sun, 31 Jul 2016 22:40:43 +0200 Subject: [PATCH] Remove powerCost from triggered spells --- src/game/CreatureAI.cpp | 2 +- src/game/Spell.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/CreatureAI.cpp b/src/game/CreatureAI.cpp index 0512cb256ff..e3fded858cc 100644 --- a/src/game/CreatureAI.cpp +++ b/src/game/CreatureAI.cpp @@ -52,7 +52,7 @@ CanCastResult CreatureAI::CanCastSpell(Unit* pTarget, const SpellEntry* pSpell, return CAST_FAIL_STATE; // Check for power (also done by Spell::CheckCast()) - if (m_creature->GetPower((Powers)pSpell->powerType) < Spell::CalculatePowerCost(pSpell, m_creature)) + if (!isTriggered && (m_creature->GetPower((Powers)pSpell->powerType) < Spell::CalculatePowerCost(pSpell, m_creature))) return CAST_FAIL_POWER; if (!pSpell->HasAttribute(SPELL_ATTR_EX2_IGNORE_LOS) && !m_creature->IsWithinLOSInMap(pTarget) && m_creature != pTarget) diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 4d34fa79640..05331912c71 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -3011,7 +3011,7 @@ void Spell::SpellStart(SpellCastTargets const* targets, Aura* triggeredByAura) m_caster->m_Events.AddEvent(Event, m_caster->m_Events.CalculateTime(1)); // Fill cost data - m_powerCost = CalculatePowerCost(m_spellInfo, m_caster, this, m_CastItem); + m_powerCost = m_IsTriggeredSpell ? 0 : CalculatePowerCost(m_spellInfo, m_caster, this, m_CastItem); SpellCastResult result = PreCastCheck(); if (result != SPELL_CAST_OK)