Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 02:46:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: Fixed Taste for Blood and Glyph of Overpower after recent combo point changes

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Shauren
2010-09-08 10:59:10 +02:00
parent 3999444157
commit e5d612d339
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/game/Spells/Spell.cpp
View File

@@ -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)