diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-08-03 00:20:44 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-08-03 00:20:44 +0100 |
| commit | f85908869986eab0b645f0a697028bcceba7778c (patch) | |
| tree | 01d81d0a2c8656e864c4d5a7a65409e49589b08b /src/server/game | |
| parent | 2060a2037a9d03318c2cdcd791821f7b58a19ea5 (diff) | |
Core/Misc: Fix code style and a typo for recently merged in PRs
Diffstat (limited to 'src/server/game')
| -rwxr-xr-x | src/server/game/Spells/Auras/SpellAuras.cpp | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 15108b17f84..8a320ae35e7 100755 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1594,10 +1594,13 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b { case 19746: // Improved concentration aura - linked aura - if (caster->HasAura(20254) || caster->HasAura(20255) || caster->HasAura(20256)) + if (caster->HasAura(20254) || caster->HasAura(20255) || caster->HasAura(20256)) + { if (apply) target->CastSpell(target, 63510, true); - else target->RemoveAura(63510); + else + target->RemoveAura(63510); + } case 31821: // Aura Mastery Triggered Spell Handler // If apply Concentration Aura -> trigger -> apply Aura Mastery Immunity @@ -1606,6 +1609,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b // Do effects only on aura owner if (GetCasterGUID() != target->GetGUID()) break; + if (apply) { if ((GetSpellInfo()->Id == 31821 && target->HasAura(19746, GetCasterGUID())) || (GetSpellInfo()->Id == 19746 && target->HasAura(31821))) @@ -1625,19 +1629,25 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b } break; } - if (GetSpellInfo()->GetSpellSpecific() == SPELL_SPECIFIC_AURA) - { + if (GetSpellInfo()->GetSpellSpecific() == SPELL_SPECIFIC_AURA) + { // Improved devotion aura if (caster->HasAura(20140) || caster->HasAura(20138) || caster->HasAura(20139)) + { if (apply) caster->CastSpell(target, 63514, true); - else target->RemoveAura(63514); + else + target->RemoveAura(63514); + } // 63531 - linked aura for both Sanctified Retribution and Swift Retribution talents // Not allow for Retribution Aura (prevent stacking) if ((GetSpellInfo()->SpellIconID != 555) && (caster->HasAura(53648) || caster->HasAura(53484) || caster->HasAura(53379) || caster->HasAura(31869))) + { if (apply) caster->CastSpell(target, 63531, true); - else target->RemoveAura(63531); + else + target->RemoveAura(63531); + } } break; case SPELLFAMILY_DEATHKNIGHT: |