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

*Cleanup 649167cf44ca

Browse Source 
--HG--
branch : trunk
This commit is contained in:
maximius
2009-10-18 17:04:54 -07:00
parent 9cd569b3f5
commit 3a48de01e7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Unit.cpp
+5 -5
View File
@@ -10306,18 +10306,18 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage,WeaponAttackType attT
if (spellProto) if (spellProto)
{ {
// Mod damage from spell mechanic // Mod damage from spell mechanic
uint32 mechanicMask = GetAllSpellMechanicMask(m_spellInfo); uint32 mechanicMask = GetAllSpellMechanicMask(spellProto);
// Shred, Maul - "Effects which increase Bleed damage also increase Shred damage" // Shred, Maul - "Effects which increase Bleed damage also increase Shred damage"
if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DRUID && m_spellInfo->SpellFamilyFlags[0] & 0x00008800) if (spellProto->SpellFamilyName == SPELLFAMILY_DRUID && spellProto->SpellFamilyFlags[0] & 0x00008800)
mechanicMask |= (1<<MECHANIC_BLEED); mechanicMask |= (1<<MECHANIC_BLEED);
if (mechanicMask) if (mechanicMask)
{ {
Unit::AuraEffectList const& mDamageDoneMechanic = unitTarget->GetAurasByType(SPELL_AURA_MOD_MECHANIC_DAMAGE_TAKEN_PERCENT); AuraEffectList const& mDamageDoneMechanic = pVictim->GetAurasByType(SPELL_AURA_MOD_MECHANIC_DAMAGE_TAKEN_PERCENT);
for(Unit::AuraEffectList::const_iterator i = mDamageDoneMechanic.begin();i != mDamageDoneMechanic.end(); ++i) for (AuraEffectList::const_iterator i = mDamageDoneMechanic.begin(); i != mDamageDoneMechanic.end(); ++i)
if (mechanicMask & uint32(1<<((*i)->GetMiscValue()))) if (mechanicMask & uint32(1<<((*i)->GetMiscValue())))
totalDamagePercentMod *= ((*i)->GetAmount()+100.0f)/100.0f; TakenTotalMod *= ((*i)->GetAmount()+100.0f)/100.0f;
} }
} }