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:
Carbenium committed 2015-07-21 21:21:09 +02:00
commit 9d3b94f7f2
30 files changed
+310 -293

No files matched your search

+2 -2
View File
@@ -1046,7 +1046,7 @@ class spell_dk_pestilence : public SpellScriptLoader
{
aurEffNew->SetCritChance(critChance); // Blood Plague can crit if caster has T9.
aurEffNew->SetDonePct(donePct);
aurEffNew->SetDamage(caster->SpellDamageBonusDone(hitUnit, aurEffNew->GetSpellInfo(), std::max(aurEffNew->GetAmount(), 0), DOT) * donePct);
aurEffNew->SetBonusAmount(caster->SpellDamageBonusDone(hitUnit, aurEffNew->GetSpellInfo(), 0, DOT));
}
}
}
@@ -1065,7 +1065,7 @@ class spell_dk_pestilence : public SpellScriptLoader
if (AuraEffect* aurEffNew = aurNew->GetEffect(EFFECT_0))
{
aurEffNew->SetDonePct(donePct);
aurEffNew->SetDamage(caster->SpellDamageBonusDone(hitUnit, aurEffNew->GetSpellInfo(), std::max(aurEffNew->GetAmount(), 0), DOT) * donePct);
aurEffNew->SetBonusAmount(caster->SpellDamageBonusDone(hitUnit, aurEffNew->GetSpellInfo(), 0, DOT));
}
}
}