Merge commit 'ccdc100d10143285bc058d968f0472ea4d073120' into 4.3.4
Conflicts: sql/updates/world/2015_01_09_01_world.sql sql/updates/world/2015_01_18_00_world.sql src/server/game/Entities/Unit/Unit.cpp src/server/scripts/Spells/spell_hunter.cpp src/server/scripts/Spells/spell_warlock.cpp src/tools/CMakeLists.txt
This commit is contained in:
commit
9d3b94f7f2
30 files changed
+310
-293
No files matched your search
@@ -543,9 +543,7 @@ class spell_warl_everlasting_affliction : public SpellScriptLoader
|
||||
// Refresh corruption on target
|
||||
if (AuraEffect* aurEff = target->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_WARLOCK, 0x2, 0, 0, caster->GetGUID()))
|
||||
{
|
||||
uint32 damage = std::max(aurEff->GetAmount(), 0);
|
||||
sScriptMgr->ModifyPeriodicDamageAurasTick(target, caster, damage);
|
||||
aurEff->SetDamage(caster->SpellDamageBonusDone(target, aurEff->GetSpellInfo(), damage, DOT) * aurEff->GetDonePct());
|
||||
aur->SetBonusAmount(caster->SpellDamageBonusDone(target, aur->GetSpellInfo(), 0, DOT));
|
||||
aurEff->CalculatePeriodic(caster, false, false);
|
||||
aurEff->GetBase()->RefreshDuration(true);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user