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

Core/Unit: Make sure pets respect unit damage resilience and the other way around (patch by Dr. Tenma)

Browse Source 
Fixes issue #3918

--HG--
branch : trunk
This commit is contained in:
click
2010-09-12 14:29:09 +02:00
parent 6a4c798867
commit 855ec1cd01
3 changed files with 90 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/Auras/SpellAuraEffects.cpp
+6 -18
View File
@@ -1360,15 +1360,9 @@ void AuraEffect::PeriodicTick(Unit * target, Unit * caster) const
if (crit)
damage = caster->SpellCriticalDamageBonus(m_spellProto, damage, target);
// Reduce damage from resilience for players and pets only.
// As of patch 3.3 pets inherit 100% of master resilience.
if (caster->GetSpellModOwner())
if (Player* modOwner = target->GetSpellModOwner())
{
if (crit)
damage -= modOwner->GetSpellCritDamageReduction(damage);
damage -= modOwner->GetSpellDamageReduction(damage);
}
int32 dmg = damage;
caster->ApplyResilience(target, NULL, &dmg, crit, CR_CRIT_TAKEN_SPELL);
damage = dmg;
caster->CalcAbsorbResist(target, GetSpellSchoolMask(GetSpellProto()), DOT, damage, &absorb, &resist, m_spellProto);
@@ -1445,15 +1439,9 @@ void AuraEffect::PeriodicTick(Unit * target, Unit * caster) const
damage = damageReductedArmor;
}
// Reduce damage from resilience for players and pets only.
// As of patch 3.3 pets inherit 100% of master resilience.
if (caster->GetSpellModOwner())
if (Player* modOwner = target->GetSpellModOwner())
{
if (crit)
damage -= modOwner->GetSpellCritDamageReduction(damage);
damage -= modOwner->GetSpellDamageReduction(damage);
}
int32 dmg = damage;
caster->ApplyResilience(target, NULL, &dmg, crit, CR_CRIT_TAKEN_SPELL);
damage = dmg;
caster->CalcAbsorbResist(target, GetSpellSchoolMask(GetSpellProto()), DOT, damage, &absorb, &resist, m_spellProto);