Core/Spells: removed more duplicate bonuses
This commit is contained in:
1 parent
0c2cdee7a0
commit
6f7aca2df5
1 file changed
+1
-20
@@ -6616,7 +6616,7 @@ uint32 Unit::SpellDamageBonusDone(Unit* victim, SpellInfo const* spellProto, uin
|
||||
return pdamage;
|
||||
|
||||
// For totems and pets use owner's bonus data
|
||||
if (GetTypeId() == TYPEID_UNIT && IsTotem())
|
||||
if (IsCreature())
|
||||
if (Unit* owner = GetOwner())
|
||||
return owner->SpellDamageBonusDone(victim, spellProto, pdamage, damagetype, effIndex, stack);
|
||||
|
||||
@@ -6886,25 +6886,6 @@ float Unit::SpellDamagePctDone(Unit* victim, SpellInfo const* spellProto, Damage
|
||||
AddPct(DoneTotalMod, aurEff->GetAmount());
|
||||
}
|
||||
break;
|
||||
case SPELLFAMILY_WARLOCK:
|
||||
// Fire and Brimstone
|
||||
if (spellProto->SpellFamilyFlags[1] & 0x00020040)
|
||||
if (victim->HasAuraState(AURA_STATE_CONFLAGRATE))
|
||||
{
|
||||
AuraEffectList const& mDumyAuras = GetAuraEffectsByType(SPELL_AURA_DUMMY);
|
||||
for (AuraEffectList::const_iterator i = mDumyAuras.begin(); i != mDumyAuras.end(); ++i)
|
||||
if ((*i)->GetSpellInfo()->SpellIconID == 3173)
|
||||
{
|
||||
AddPct(DoneTotalMod, (*i)->GetAmount());
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// Shadow Bite (30% increase from each dot)
|
||||
if (spellProto->SpellFamilyFlags[1] & 0x00400000 && IsPet())
|
||||
if (uint8 count = victim->GetDoTsByCaster(GetOwnerGUID()))
|
||||
AddPct(DoneTotalMod, 30 * count);
|
||||
break;
|
||||
case SPELLFAMILY_DEATHKNIGHT:
|
||||
// Sigil of the Vengeful Heart
|
||||
if (spellProto->SpellFamilyFlags[0] & 0x2000)
|
||||
|
||||
Reference in new issue
Block a user