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

Core/Auras: moved SPELL_AURA_MOD_MELEE_DAMAGE_FROM_CASTER handling to MeleeDamageBonusDone

Browse Source
This commit is contained in:
Ovahlord
2020-02-05 08:42:29 +01:00
parent 8ed081b6e7
commit a5adc77f04
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8001,10 +8001,19 @@ uint32 Unit::MeleeDamageBonusDone(Unit* victim, uint32 pdamage, WeaponAttackType
if (spellProto)
AddPct(DoneTotalMod, GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_DAMAGE_DONE_FOR_MECHANIC, spellProto->Mechanic));
// Add SPELL_AURA_MOD_AUTOATTACK_DAMAGE percent bonus
if (!spellProto)
{
// Add SPELL_AURA_MOD_AUTOATTACK_DAMAGE percent bonus
AddPct(DoneTotalMod, GetTotalAuraModifier(SPELL_AURA_MOD_AUTOATTACK_DAMAGE));
// Add SPELL_AURA_MOD_MELEE_DAMAGE_FROM_CASTER percent bonus
// This aura name is a bit misleading but it's actually only suposed to increase melee auto attack damage
AddPct(DoneTotalMod, victim->GetTotalAuraMultiplier(SPELL_AURA_MOD_MELEE_DAMAGE_FROM_CASTER, [this](AuraEffect const* effect)->bool
{
return effect->GetCasterGUID() == GetGUID();
}));
}
// done scripted mod (take it from owner)
// Unit* owner = GetOwner() ? GetOwner() : this;
// AuraEffectList const& mOverrideClassScript = owner->GetAuraEffectsByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS);
@@ -8090,18 +8099,7 @@ uint32 Unit::MeleeDamageBonusTaken(Unit* attacker, uint32 pdamage, WeaponAttackT
if (attType != RANGED_ATTACK)
{
TakenTotalMod *= GetTotalAuraMultiplier(SPELL_AURA_MOD_MELEE_DAMAGE_TAKEN_PCT);
if (!spellProto)
{
// This aura name is a bit misleading but it's actually only suposed to increase melee auto attack damage
TakenTotalMod *= GetTotalAuraMultiplier(SPELL_AURA_MOD_MELEE_DAMAGE_FROM_CASTER, [attacker](AuraEffect const* effect)->bool
{
return effect->GetCasterGUID() == attacker->GetGUID();
});
}
}
else
TakenTotalMod *= GetTotalAuraMultiplier(SPELL_AURA_MOD_RANGED_DAMAGE_TAKEN_PCT);