diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 9 | ||||
| -rwxr-xr-x | src/server/game/Spells/SpellEffects.cpp | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 08138c5499f..b1fab1b9563 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -10159,6 +10159,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3 } break; case SPELLFAMILY_PRIEST: + // Mind Flay if (spellProto->SpellFamilyFlags[0] & 0x800000) { // Glyph of Shadow Word: Pain @@ -10173,6 +10174,14 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3 if (pVictim->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, 0x8000, 0,0, GetGUID())) AddPctN(DoneTotalMod, aurEff->GetAmount()); } + // Smite + else if (spellProto->SpellFamilyFlags[0] & 0x80) + { + // Glyph of Smite + if (AuraEffect * aurEff = GetAuraEffect(55692, 0)) + if (pVictim->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, 0x100000, 0, 0, GetGUID())) + AddPctN(DoneTotalMod, aurEff->GetAmount()); + } break; case SPELLFAMILY_PALADIN: // Judgement of Vengeance/Judgement of Corruption diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 4c7ccddc692..3e8aea4fe63 100755 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -582,14 +582,6 @@ void Spell::SpellDamageSchoolDmg(SpellEffIndex effIndex) if (roll_chance_i(aurEff->GetAmount())) m_caster->CastSpell(unitTarget, 48301, true); } - // Smite - else if (m_spellInfo->SpellFamilyFlags[0] & 0x80) - { - // Glyph of Smite - if (AuraEffect * aurEff = m_caster->GetAuraEffect(55692, 0)) - if (unitTarget->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, 0x100000, 0, 0, m_caster->GetGUID())) - AddPctN(damage, aurEff->GetAmount()); - } // Improved Mind Blast (Mind Blast in shadow form bonus) else if (m_caster->GetShapeshiftForm() == FORM_SHADOW && (m_spellInfo->SpellFamilyFlags[0] & 0x00002000)) { |