diff options
| author | megamage <none@none> | 2009-03-02 17:33:59 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-03-02 17:33:59 -0600 |
| commit | 797063d6695d36ebfde33433c9f33b9634ce415c (patch) | |
| tree | fab11076bffef691a2a3ef350111d0e53e8dd8d9 /src/game/Unit.cpp | |
| parent | 224c0912b6aa2dd428c65798c587a39b73068118 (diff) | |
*Revert some changes of 243.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 049991d229e..480a2724d0f 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -6344,27 +6344,25 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu { if (dummySpell->Id == 17619) { - if (procSpell->Category==4) //potion category + if (procSpell->SpellFamilyName == SPELLFAMILY_POTION) { for (uint8 i=0;i<3;i++) { if (procSpell->Effect[i]==SPELL_EFFECT_HEAL) { - basepoints0 = damage * 0.4f; triggered_spell_id = 21399; } else if (procSpell->Effect[i]==SPELL_EFFECT_ENERGIZE) { - basepoints0 = CalculateSpellDamage(procSpell,i,procSpell->EffectBasePoints[i],this) * 0.4f; - triggered_spell_id = 21400; + triggered_spell_id = 21400; } - else continue; + else + continue; + basepoints0 = CalculateSpellDamage(procSpell,i,procSpell->EffectBasePoints[i],this) * 0.4f; CastCustomSpell(this,triggered_spell_id,&basepoints0,NULL,NULL,true,castItem,triggeredByAura); } - if (triggered_spell_id) - return true; - return false; + return true; } } } |