aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkandera <kanderadev@gmail.com>2012-09-24 08:37:07 -0700
committerkandera <kanderadev@gmail.com>2012-09-24 08:37:07 -0700
commita3bf6cbacd95d9a5517e61f642c9b571f8aaad93 (patch)
tree02af5159628ac8ea6a4e14ee65344b646a4afc9e
parent8be79542cab06e6b1422b3474dff5647c3cbff95 (diff)
parent58d3758f4c8913ffd734b2d963a22bccd55b879a (diff)
Merge pull request #7860 from Faq/Divine3
Core/Spell: Correcting previos PR. splitamount is already calculated in ...
-rw-r--r--src/server/scripts/Spells/spell_paladin.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp
index ad0ed6a7e20..e2f449e38a1 100644
--- a/src/server/scripts/Spells/spell_paladin.cpp
+++ b/src/server/scripts/Spells/spell_paladin.cpp
@@ -623,7 +623,7 @@ class spell_pal_divine_sacrifice : public SpellScriptLoader
{
PrepareAuraScript(spell_pal_divine_sacrifice_AuraScript);
- uint32 splitPct, groupSize, minHpPct;
+ uint32 groupSize, minHpPct;
int32 remainingAmount;
Unit* caster;
@@ -639,15 +639,13 @@ class spell_pal_divine_sacrifice : public SpellScriptLoader
groupSize = 1;
remainingAmount = (caster->CountPctFromMaxHealth(GetSpellInfo()->Effects[EFFECT_2].CalcValue(caster)) * groupSize);
- splitPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(caster);
minHpPct = GetSpellInfo()->Effects[EFFECT_1].CalcValue(caster);
return true;
}
- void Split(AuraEffect* /*aurEff*/, DamageInfo & dmgInfo, uint32 & splitAmount)
+ void Split(AuraEffect* /*aurEff*/, DamageInfo & /*dmgInfo*/, uint32 & splitAmount)
{
- splitAmount = CalculatePctN(dmgInfo.GetDamage(), splitPct);
remainingAmount -= splitAmount;
// break when absorbed everything it could, or if the casters hp drops below 20%