Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-27 20:32:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Auras: Properly fix SPELL_AURA_DAMAGE_SHIELD

Browse Source
This commit is contained in:
tobmaps
2011-05-13 19:43:32 +07:00
parent 7fac55db66
commit 2d6912cd2e
4 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/game/Entities/Unit/Unit.cpp
View File

@@ -1456,6 +1456,16 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss)
uint32 damage = (*dmgShieldItr)->GetAmount();
int32 bonus = 0;
bonus += GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, GetSpellSchoolMask(i_spellProto));
if (Unit * caster = (*dmgShieldItr)->GetCaster())
{
bonus += caster->GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, GetSpellSchoolMask(i_spellProto));
bonus += caster->GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_DAMAGE_DONE_VERSUS, GetCreatureTypeMask());
}
if (bonus)
AddPctN(damage, bonus);
// No Unit::CalcAbsorbResist here - opcode doesn't send that data - this damage is probably not affected by that
pVictim->DealDamageMods(this, damage, NULL);

18
src/server/game/Spells/Auras/SpellAuraEffects.cpp
View File

@@ -597,10 +597,20 @@ int32 AuraEffect::CalculateAmount(Unit * caster)
case SPELL_AURA_DAMAGE_SHIELD:
if (!caster)
break;
// Thorns
if (GetSpellProto()->SpellFamilyName == SPELLFAMILY_DRUID && m_spellProto->SpellFamilyFlags[0] & 0x100)
// 3.3% from sp bonus
DoneActualBenefit = caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.033f;
if (caster->GetTypeId() == TYPEID_PLAYER)
{
DoneActualBenefit += caster->SpellDamageBonus(GetBase()->GetUnitOwner(), GetSpellProto(), 0, SPELL_DIRECT_DAMAGE);
DoneActualBenefit *= caster->CalculateLevelPenalty(GetSpellProto());
amount += (int32)DoneActualBenefit;
// Thorns
if (GetSpellProto()->SpellFamilyName == SPELLFAMILY_DRUID && m_spellProto->SpellFamilyFlags[0] & 0x100)
if (AuraEffect * aurEff = caster->GetAuraEffectOfRankedSpell(16836, 0))
AddPctN(amount, aurEff->GetAmount());
return amount;
}
break;
case SPELL_AURA_PERIODIC_DAMAGE:
if (!caster)