From e5d612d33962ad2c5dc21f85a8abe77d6a63db12 Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 8 Sep 2010 10:59:10 +0200 Subject: Core/Spells: Fixed Taste for Blood and Glyph of Overpower after recent combo point changes --HG-- branch : trunk --- src/server/game/Spells/Spell.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index bb2d38aca6d..de027769740 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -4771,6 +4771,7 @@ SpellCastResult Spell::CheckCast(bool strict) { if ((*j)->IsAffectedOnSpell(m_spellInfo)) { + m_needComboPoints = false; if ((*j)->GetMiscValue() == 1) { reqCombat=false; @@ -5733,8 +5734,10 @@ SpellCastResult Spell::CheckCast(bool strict) } // check if caster has at least 1 combo point for spells that require combo points - if (m_needComboPoints && m_caster->ToPlayer() && !m_caster->ToPlayer()->GetComboPoints()) - return SPELL_FAILED_NO_COMBO_POINTS; + if (m_needComboPoints) + if (Player* plrCaster = m_caster->ToPlayer()) + if (!m_caster->ToPlayer()->GetComboPoints()) + return SPELL_FAILED_NO_COMBO_POINTS; // don't allow channeled spells / spells with cast time to be casted while moving // (even if they are interrupted on moving, spells with almost immediate effect get to have their effect processed before movement interrupter kicks in) -- cgit v1.2.3