josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Fix Imp leader of the pack once again. Original patch by loop69.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
QAston
2009-03-07 02:28:14 +01:00
parent bdaf54067b
commit dbb8c78394
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/updates/1679_world.sql
-3
View File
@@ -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);
src/game/Unit.cpp
+5 -8
View File
@@ -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()) if (pVictim->GetTypeId() == TYPEID_UNIT && !((Creature*)pVictim)->isPet() && !((Creature*)pVictim)->hasLootRecipient())
((Creature*)pVictim)->SetLootRecipient(this); ((Creature*)pVictim)->SetLootRecipient(this);
if (health <= damage) if (health <= damage)
{ {
DEBUG_LOG("DealDamage: victim just died"); DEBUG_LOG("DealDamage: victim just died");
@@ -5561,7 +5560,12 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
if (triggerAmount == 0) if (triggerAmount == 0)
return false; return false;
basepoints0 = triggerAmount * GetMaxHealth() / 100; basepoints0 = triggerAmount * GetMaxHealth() / 100;
target = this;
triggered_spell_id = 34299; 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; break;
} }
// Healing Touch (Dreamwalker Raiment set) // Healing Touch (Dreamwalker Raiment set)
@@ -5661,13 +5665,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
basepoints0 = triggerAmount * damage / 100; basepoints0 = triggerAmount * damage / 100;
break; 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; break;
} }
case SPELLFAMILY_ROGUE: case SPELLFAMILY_ROGUE: