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
@@ -750,9 +750,7 @@ class spell_pri_pain_and_suffering_proc : public SpellScriptLoader
|
||||
if (Unit* target = GetHitUnit())
|
||||
if (AuraEffect* aur = target->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, 0x8000, 0, 0, caster->GetGUID()))
|
||||
{
|
||||
uint32 damage = std::max(aur->GetAmount(), 0);
|
||||
sScriptMgr->ModifyPeriodicDamageAurasTick(target, caster, damage);
|
||||
aur->SetDamage(caster->SpellDamageBonusDone(target, aur->GetSpellInfo(), damage, DOT) * aur->GetDonePct());
|
||||
aur->SetBonusAmount(caster->SpellDamageBonusDone(target, aur->GetSpellInfo(), 0, DOT));
|
||||
aur->CalculatePeriodic(caster, false, false);
|
||||
aur->GetBase()->RefreshDuration();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user