diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/SpellEffects.cpp | 8 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 36 |
2 files changed, 18 insertions, 26 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index ae64679d698..6fe1a576838 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -431,7 +431,6 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) } break; } - case SPELLFAMILY_WARRIOR: { // Bloodthirst @@ -439,14 +438,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) damage = uint32(damage * (m_caster->GetTotalAttackPowerValue(BASE_ATTACK)) / 100); // Shield Slam else if(m_spellInfo->SpellFamilyFlags[1] & 0x200 && m_spellInfo->Category == 1209) - { damage += int32(m_caster->GetShieldBlockValue()); - - // Glyph of Shield Slam - if (m_caster->HasAura(58375)) - m_caster->CastSpell(m_caster, 58374, true); - } - // Victory Rush else if(m_spellInfo->SpellFamilyFlags[1] & 0x100) { diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index ef43089836a..1b0c532ed47 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -5059,12 +5059,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger triggered_spell_id = 26654; break; } - // Glyph of Blocking - case 58375: - { - triggered_spell_id = 58374; - break; - } // Unstable Power case 24658: { @@ -5665,18 +5659,24 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger basepoints0 = GetShieldBlockValue() * triggerAmount / 100; break; } - // Glyph of Sunder Armor
- if (dummySpell->Id == 58387)
- {
- if (!pVictim || !pVictim->isAlive() || !procSpell)
- return false;
-
- target = SelectNearbyTarget();
- if (!target || target == pVictim)
- return false;
-
- CastSpell(target, 58567, true);
- return true;
+ // Glyph of Blocking + if (dummySpell->Id == 58375) + { + triggered_spell_id = 58374; + break; + } + // Glyph of Sunder Armor + if (dummySpell->Id == 58387) + { + if (!pVictim || !pVictim->isAlive() || !procSpell) + return false; + + target = SelectNearbyTarget(); + if (!target || target == pVictim) + return false; + + CastSpell(target, 58567, true); + return true; } break; } |