aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortobmaps <spambot42@yandex.ru>2011-05-12 18:34:29 +0700
committertobmaps <spambot42@yandex.ru>2011-05-12 18:34:29 +0700
commit88633a0be9c23a60800614fb17016ec89a23380c (patch)
tree19c3557c02dbe7ccfa8a19dd5ed24a7fcb41dfad /src
parent15632fc81aeedc6e1714edb2383d55049d6c9089 (diff)
Core/Spells: Fix Shadow Bite damage
Closes #591 & #1220 & #1401
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/game/Entities/Unit/Unit.cpp4
-rwxr-xr-xsrc/server/game/Spells/SpellEffects.cpp3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 9113461729a..2abfac467c4 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -10445,6 +10445,10 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
if (spellProto->SpellFamilyFlags[0] & 0x00004000)
if (HasAura(200000))
DoneTotalMod *= 4;
+ // Shadow Bite (15% increase from each dot)
+ if (spellProto->SpellFamilyFlags[1] & 0x00400000 && isPet())
+ if (uint8 count = pVictim->GetDoTsByCaster(GetOwnerGUID()))
+ AddPctN(DoneTotalMod, 15 * count);
break;
case SPELLFAMILY_HUNTER:
// Steady Shot
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index a8c954e652a..5b677d554a0 100755
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -543,9 +543,6 @@ void Spell::SpellDamageSchoolDmg(SpellEffIndex effIndex)
{
if (m_caster->GetTypeId() == TYPEID_UNIT && m_caster->ToCreature()->isPet())
{
- // Get DoTs on target by owner (5% increase by dot)
- damage += int32(CalculatePctN(unitTarget->GetDoTsByCaster(m_caster->GetOwnerGUID()), 5));
-
if (Player* owner = m_caster->GetOwner()->ToPlayer())
{
if (AuraEffect* aurEff = owner->GetAuraEffect(SPELL_AURA_ADD_FLAT_MODIFIER, SPELLFAMILY_WARLOCK, 214, 0))