diff options
| -rw-r--r-- | sql/updates/1679_world.sql | 3 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 13 |
2 files changed, 5 insertions, 11 deletions
diff --git a/sql/updates/1679_world.sql b/sql/updates/1679_world.sql deleted file mode 100644 index 444e06bb168..00000000000 --- a/sql/updates/1679_world.sql +++ /dev/null @@ -1,3 +0,0 @@ --- Imp leader of the pack -INSERT INTO `spell_proc_event` VALUES (34300, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 6); -INSERT INTO `spell_proc_event` VALUES (34297, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 6);
\ No newline at end of file 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: |