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

Core/Spells: Remove some incanter's absorbtion code forgotten in previous rev.

Browse Source
This commit is contained in:
QAston
2010-12-30 19:44:13 +01:00
parent 8cd2c73e45
commit 3fc69f8619
1 changed files with 54 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Unit/Unit.cpp
-18
View File
@@ -1614,9 +1614,6 @@ void Unit::CalcAbsorbResist(Unit *pVictim, SpellSchoolMask schoolMask, DamageEff
dmgInfo.ResistDamage(uint32(damageResisted)); dmgInfo.ResistDamage(uint32(damageResisted));
} }
// Incanter's Absorption, for converting to spell power
int32 incanterAbsorption = 0;
// Ignore Absorption Auras // Ignore Absorption Auras
float auraAbsorbMod = 0; float auraAbsorbMod = 0;
AuraEffectList const & AbsIgnoreAurasA = GetAuraEffectsByType(SPELL_AURA_MOD_TARGET_ABSORB_SCHOOL); AuraEffectList const & AbsIgnoreAurasA = GetAuraEffectsByType(SPELL_AURA_MOD_TARGET_ABSORB_SCHOOL);
@@ -1696,8 +1693,6 @@ void Unit::CalcAbsorbResist(Unit *pVictim, SpellSchoolMask schoolMask, DamageEff
} }
} }
if (auraAbsorbMod < 100) // Do nothing if 100% absorb ignore
{
// absorb by mana cost // absorb by mana cost
AuraEffectList vManaShieldCopy(pVictim->GetAuraEffectsByType(SPELL_AURA_MANA_SHIELD)); AuraEffectList vManaShieldCopy(pVictim->GetAuraEffectsByType(SPELL_AURA_MANA_SHIELD));
for (AuraEffectList::const_iterator itr = vManaShieldCopy.begin(); (itr != vManaShieldCopy.end()) && (dmgInfo.GetDamage() > 0); ++itr) for (AuraEffectList::const_iterator itr = vManaShieldCopy.begin(); (itr != vManaShieldCopy.end()) && (dmgInfo.GetDamage() > 0); ++itr)
@@ -1756,7 +1751,6 @@ void Unit::CalcAbsorbResist(Unit *pVictim, SpellSchoolMask schoolMask, DamageEff
absorbAurEff->GetBase()->Remove(AURA_REMOVE_BY_ENEMY_SPELL); absorbAurEff->GetBase()->Remove(AURA_REMOVE_BY_ENEMY_SPELL);
} }
} }
}
// split damage auras - only when not damaging self // split damage auras - only when not damaging self
if (pVictim != this) if (pVictim != this)
@@ -1832,18 +1826,6 @@ void Unit::CalcAbsorbResist(Unit *pVictim, SpellSchoolMask schoolMask, DamageEff
*resist = dmgInfo.GetResist(); *resist = dmgInfo.GetResist();
*absorb = dmgInfo.GetAbsorb(); *absorb = dmgInfo.GetAbsorb();
// Incanter's Absorption, if have affective absorbing
if (incanterAbsorption)
{
// Incanter's Absorption
if (AuraEffect const * aurEff = pVictim->GetDummyAuraEffect(SPELLFAMILY_GENERIC, 2941, EFFECT_0))
{
int32 new_dmg = CalculatePctN(int32(*absorb), aurEff->GetAmount());
if (new_dmg > 0)
pVictim->CastCustomSpell(pVictim, 44413, &new_dmg, NULL, NULL, true);
}
}
} }
void Unit::CalcHealAbsorb(Unit *pVictim, const SpellEntry *healSpell, uint32 &healAmount, uint32 &absorb) void Unit::CalcHealAbsorb(Unit *pVictim, const SpellEntry *healSpell, uint32 &healAmount, uint32 &absorb)