diff options
| author | QAston <none@none> | 2009-06-12 11:09:04 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-06-12 11:09:04 +0200 |
| commit | 87fdc76117683190ba47baad62829e76ffd3448c (patch) | |
| tree | 9b3b19388b8c97c48b76bd089db7bd9671bdf384 /src | |
| parent | 7487b22063075179560ec7852ca86b2c542aa2e7 (diff) | |
*Fix a typo which caused Flame shock to be not consumed by lava burst.
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Spell.cpp | 2 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index fbc4b026a9d..c4047a56226 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -1221,7 +1221,7 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask) if(m_caster->GetTypeId() == TYPEID_PLAYER) ((Player*)m_caster)->UpdatePvP(true); } - if( unit->isInCombat() && !(m_spellInfo->AttributesEx & SPELL_ATTR_EX3_NO_INITIAL_AGGRO) ) + if( unit->isInCombat() && !(m_spellInfo->AttributesEx3 & SPELL_ATTR_EX3_NO_INITIAL_AGGRO) ) { m_caster->SetInCombatState(unit->GetCombatTimer() > 0); unit->getHostilRefManager().threatAssist(m_caster, 0.0f); diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 840a7767d6d..ed183277901 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -9279,7 +9279,7 @@ bool Unit::isSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolM // Lava Burst if (spellProto->SpellFamilyFlags[1] & 0x00001000) { - if (AuraEffect *flameShock = pVictim->GetAura(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_SHAMAN, 10000000, 0,0, GetGUID())) + if (AuraEffect *flameShock = pVictim->GetAura(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_SHAMAN, 0x10000000, 0,0, GetGUID())) { // Consume shock aura if not have Glyph of Flame Shock if (!GetAuraEffect(55447, 0)) |