diff options
| author | QAston <none@none> | 2009-03-07 02:28:14 +0100 |
|---|---|---|
| committer | QAston <none@none> | 2009-03-07 02:28:14 +0100 |
| commit | dbb8c78394660c277f9056d899df8b0f9f1f8cb0 (patch) | |
| tree | 6ccdb90a714999fe134f929cc94cc0217fbc4f7b /src/game/Unit.cpp | |
| parent | bdaf54067b1c412dfe0b059d3d1e136f37af387f (diff) | |
*Fix Imp leader of the pack once again. Original patch by loop69.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 8fb5d008c66..6ef78377aff 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -743,7 +743,6 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa if (pVictim->GetTypeId() == TYPEID_UNIT && !((Creature*)pVictim)->isPet() && !((Creature*)pVictim)->hasLootRecipient()) ((Creature*)pVictim)->SetLootRecipient(this); - if (health <= damage) { DEBUG_LOG("DealDamage: victim just died"); @@ -5561,7 +5560,12 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu if (triggerAmount == 0) return false; basepoints0 = triggerAmount * GetMaxHealth() / 100; + target = this; triggered_spell_id = 34299; + if (triggeredByAura->GetCaster() != this) + break; + int32 basepoints1 = triggerAmount * 2 *GetMaxPower(POWER_MANA)/100; + CastCustomSpell(this,60889,&basepoints1,0,0,true,0,triggeredByAura); break; } // Healing Touch (Dreamwalker Raiment set) @@ -5661,13 +5665,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu basepoints0 = triggerAmount * damage / 100; break; } - // Improved leader of the pack - else if (dummySpell->SpellIconID == 312 && !dummySpell->SpellFamilyFlags) - { - triggered_spell_id = 60889; - basepoints0 = triggerAmount * GetMaxPower(POWER_MANA) / 100; - break; - } break; } case SPELLFAMILY_ROGUE: |