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

*Allow imp to learn Phase Shift

Browse Source 
*Correct bonus damage for Unstable Affliction
*Correct some procflags.

--HG--
branch : trunk
rename : sql/updates/2685_world_spell_proc_event.sql => sql/updates/2774_world_spell_proc_event.sql
This commit is contained in:
QAston
2009-04-18 17:32:04 +02:00
parent fe01557bc3
commit c9290eac28
7 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/game/Spell.cpp
View File

@@ -5631,12 +5631,15 @@ void Spell::CalculateDamageDoneForAllTargets()
}
}
bool usesAmmo=true;
Unit::AuraEffectList const& Auras = m_caster->GetAurasByType(SPELL_AURA_ABILITY_CONSUME_NO_AMMO);
for(Unit::AuraEffectList::const_iterator j = Auras.begin();j != Auras.end(); ++j)
bool usesAmmo = !m_IsTriggeredSpell;
if (usesAmmo)
{
if((*j)->isAffectedOnSpell(m_spellInfo))
usesAmmo=false;
Unit::AuraEffectList const& Auras = m_caster->GetAurasByType(SPELL_AURA_ABILITY_CONSUME_NO_AMMO);
for(Unit::AuraEffectList::const_iterator j = Auras.begin();j != Auras.end(); ++j)
{
if((*j)->isAffectedOnSpell(m_spellInfo))
usesAmmo=false;
}
}
for(std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)