pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 09:31:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix out of bounds in Mob::ResourceTap

Browse Source
This commit is contained in:
Michael Cook (mackal) 2015-01-13 00:36:25 -05:00
parent 390681e0d0
commit e0602efca2
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
zone/spell_effects.cpp
View File

@ -6570,31 +6570,30 @@ bool Mob::TrySpellProjectile(Mob* spell_target, uint16 spell_id, float speed){
return true; return true;
} }
void Mob::ResourceTap(int32 damage, uint16 spellid){ void Mob::ResourceTap(int32 damage, uint16 spellid)
{
//'this' = caster //'this' = caster
if (!IsValidSpell(spellid)) if (!IsValidSpell(spellid))
return; return;
for (int i = 0; i <= EFFECT_COUNT; i++) for (int i = 0; i < EFFECT_COUNT; i++) {
{ if (spells[spellid].effectid[i] == SE_ResourceTap) {
if (spells[spellid].effectid[i] == SE_ResourceTap){ damage += (damage * spells[spellid].base[i]) / 100;
damage += (damage * spells[spellid].base[i])/100;
if (spells[spellid].max[i] && (damage > spells[spellid].max[i])) if (spells[spellid].max[i] && (damage > spells[spellid].max[i]))
damage = spells[spellid].max[i]; damage = spells[spellid].max[i];
if (spells[spellid].base2[i] == 0){ //HP Tap if (spells[spellid].base2[i] == 0) { // HP Tap
if (damage > 0) if (damage > 0)
HealDamage(damage); HealDamage(damage);
else else
Damage(this, -damage,0, SkillEvocation,false); Damage(this, -damage, 0, SkillEvocation, false);
} }
if (spells[spellid].base2[i] == 1) //Mana Tap if (spells[spellid].base2[i] == 1) // Mana Tap
SetMana(GetMana() + damage); SetMana(GetMana() + damage);
if (spells[spellid].base2[i] == 2 && IsClient()) //Endurance Tap if (spells[spellid].base2[i] == 2 && IsClient()) // Endurance Tap
CastToClient()->SetEndurance(CastToClient()->GetEndurance() + damage); CastToClient()->SetEndurance(CastToClient()->GetEndurance() + damage);
} }
} }