Merge branch master into boost
Conflicts:
BattlegroundMgr.h
This commit is contained in:
1 parent
f14399d788
commit
dfdc19f3bc
84 files changed
+2009
-890
No files matched your search
@@ -1211,11 +1211,11 @@ class spell_pal_sacred_shield : public SpellScriptLoader
|
||||
amount += int32(bonus);
|
||||
|
||||
// Arena - Dampening
|
||||
if (AuraEffect const* dampening = caster->GetAuraEffect(SPELL_GENERIC_ARENA_DAMPENING, EFFECT_0))
|
||||
AddPct(amount, dampening->GetAmount());
|
||||
if (AuraEffect const* auraEffArenaDampening = caster->GetAuraEffect(SPELL_GENERIC_ARENA_DAMPENING, EFFECT_0))
|
||||
AddPct(amount, auraEffArenaDampening->GetAmount());
|
||||
// Battleground - Dampening
|
||||
else if (AuraEffect const* dampening = caster->GetAuraEffect(SPELL_GENERIC_BATTLEGROUND_DAMPENING, EFFECT_0))
|
||||
AddPct(amount, dampening->GetAmount());
|
||||
else if (AuraEffect const* auraEffBattlegroudDampening = caster->GetAuraEffect(SPELL_GENERIC_BATTLEGROUND_DAMPENING, EFFECT_0))
|
||||
AddPct(amount, auraEffBattlegroudDampening->GetAmount());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user