server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct spell damage taken on melee attacks.

Browse Source 
- spell damage taken should be affected by auras id 14 (SPELL_AURA_MOD_DAMAGE_TAKEN)
    - fixes issue https://www.getmangos.eu/issue.php?issueid=605
This commit is contained in:
H0zen 2016-02-20 02:21:27 +02:00
parent 7e1d4c804e
commit 6c4ca38d56
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/game/Object/Unit.cpp
View File

@ -1754,12 +1754,9 @@ void Unit::DealMeleeDamage(CalcDamageInfo* damageInfo, bool durabilityLoss)
alreadyDone.insert(*i);
uint32 damage = (*i)->GetModifier()->m_amount;
SpellEntry const* i_spellProto = (*i)->GetSpellProto();
// Calculate absorb resist ??? no data in opcode for this possibly unable to absorb or resist?
// uint32 absorb;
// uint32 resist;
// CalcAbsorbResist(pVictim, SpellSchools(spellProto->School), SPELL_DIRECT_DAMAGE, damage, &absorb, &resist);
// damage-=absorb + resist;
//apply bonus damage from existing auras with id = 14 (SPELL_AURA_MOD_DAMAGE_TAKEN)
damage += SpellBaseDamageBonusTaken(GetSpellSchoolMask(i_spellProto));
pVictim->DealDamageMods(this, damage, NULL);
WorldPacket data(SMSG_SPELLDAMAGESHIELD, (8 + 8 + 4 + 4));