[3.3.5] DoT damage bonus not working #14817

jackpoz · 2015-05-31T14:16:08Z

Casting Corruption http://wotlk.openwow.com/spell=47813 with Improved Corruption http://wotlk.openwow.com/spell=17814 doesn't add any bonus damage. I used a fresh new lvl80 character with just Corruption rank 10 learnt and Improved Corruption rank 5 on the test dummies at Stormwing (same result with all dummies), doing always 180 dmg per tick

03a5d6d#commitcomment-11443669

Definitely related to #14812

The text was updated successfully, but these errors were encountered:

Keader · 2015-05-31T14:54:16Z

Some other warlock talents are with impaired functioning like the improved corruption (#14812)

how to:

Siphon Life: http://wotlk.openwow.com/spell=63108

Shadow Mastery:
http://wotlk.openwow.com/spell=18271
http://wotlk.openwow.com/spell=18272
http://wotlk.openwow.com/spell=18273
http://wotlk.openwow.com/spell=18274
http://wotlk.openwow.com/spell=18275)

contagion:
http://wotlk.openwow.com/spell=30060
http://wotlk.openwow.com/spell=30061
http://wotlk.openwow.com/spell=30062
http://wotlk.openwow.com/spell=30063
http://wotlk.openwow.com/spell=30064

If someone can reproduce the (#14812) I do the issues of other talents to my tests

jackpoz · 2015-05-31T15:26:45Z

#14812 (comment) confirmed this bug. It seems also that equipping some raid gear there is a low bonus dmg of 1.6%

robinsch · 2015-06-01T11:11:32Z

EDITED!

From 5012ff51214e8f12242d8c7ad23280b778a17b56 Mon Sep 17 00:00:00 2001
Date: Mon, 1 Jun 2015 14:39:16 +0200
Subject: [PATCH] #14817

---
 src/server/game/Entities/Unit/Unit.cpp            | 22 ++++++++++++++--------
 src/server/game/Spells/Auras/SpellAuraEffects.cpp |  6 ++++++
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 6be3d65..d290b0a 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -9949,11 +9949,14 @@ uint32 Unit::SpellDamageBonusDone(Unit* victim, SpellInfo const* spellProto, uin
         DoneTotal += int32(DoneAdvertisedBenefit * coeff * factorMod);
     }

-    // Done Percentage for DOT is already calculated, no need to do it again. The percentage mod is applied in Aura::HandleAuraSpecificMods.
     float tmpDamage = (int32(pdamage) + DoneTotal) * (damagetype == DOT ? 1.0f : SpellDamagePctDone(victim, spellProto, damagetype));
-    // apply spellmod to Done damage (flat and pct)
-    if (Player* modOwner = GetSpellModOwner())
-        modOwner->ApplySpellMod(spellProto->Id, damagetype == DOT ? SPELLMOD_DOT : SPELLMOD_DAMAGE, tmpDamage);
+    // SPELLMOD_DOT will be applied in AuraEffect::HandlePeriodicDamageAurasTick.
+    if (damagetype == SPELL_DIRECT_DAMAGE)
+    {
+        // apply spellmod to Done damage (flat and pct)
+        if (Player* modOwner = GetSpellModOwner())
+            modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_DAMAGE, tmpDamage);
+    }

     return uint32(std::max(tmpDamage, 0.0f));
 }
@@ -10793,11 +10796,14 @@ uint32 Unit::SpellHealingBonusDone(Unit* victim, SpellInfo const* spellProto, ui
             DoneTotal = 0;
     }

-    // Done Percentage for DOT is already calculated, no need to do it again. The percentage mod is applied in Aura::HandleAuraSpecificMods.
     float heal = float(int32(healamount) + DoneTotal) * (damagetype == DOT ? 1.0f : SpellHealingPctDone(victim, spellProto));
-    // apply spellmod to Done amount
-    if (Player* modOwner = GetSpellModOwner())
-        modOwner->ApplySpellMod(spellProto->Id, damagetype == DOT ? SPELLMOD_DOT : SPELLMOD_DAMAGE, heal);
+    // SPELLMOD_DOT will be applied in AuraEffect::HandlePeriodicHealAurasTick.
+    if (damagetype == SPELL_DIRECT_DAMAGE)
+    {
+        // apply spellmod to Done amount
+        if (Player* modOwner = GetSpellModOwner())
+            modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_DAMAGE, heal);
+    }

     return uint32(std::max(heal, 0.0f));
 }
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 34024d7..d2df5df 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -5845,6 +5845,9 @@ void AuraEffect::HandlePeriodicDamageAurasTick(Unit* target, Unit* caster) const
         else
             damage = std::max(int32(damage * GetDonePct()), 0);

+        if (Player* modOwner = caster->GetSpellModOwner())
+            modOwner->ApplySpellMod(GetSpellInfo()->Id, SPELLMOD_DOT, damage);
+
         damage = target->SpellDamageBonusTaken(caster, GetSpellInfo(), damage, DOT, GetBase()->GetStackAmount());

         // Calculate armor mitigation
@@ -6148,6 +6151,9 @@ void AuraEffect::HandlePeriodicHealAurasTick(Unit* target, Unit* caster) const
         else
             damage = std::max(int32(damage * GetDonePct()), 0);

+        if (Player* modOwner = caster->GetSpellModOwner())
+            modOwner->ApplySpellMod(GetSpellInfo()->Id, SPELLMOD_DOT, damage);
+
         damage = target->SpellHealingBonusTaken(caster, GetSpellInfo(), damage, DOT, GetBase()->GetStackAmount());
     }

-- 
1.9.5.msysgit.1

Shauren · 2015-06-01T11:22:58Z

@robinsch This is partially what I had in mind with fixing it but your patch is not complete. ApplySpellMod is still called for !isAreaAura much earlier in the process but using base value 0 (and 0 * anything is still 0). This is a major problem if the spellmod has limited charges, you would consume them twice.
My proposal is to remove applying SPELLMOD_DOT entirely from SpellDamageBonusDone/SpellHealingBonusDone and just apply it unconditionally in AuraEffect::HandlePeriodic__Tick, just before the call to target->Spell__BonusTaken

robinsch · 2015-06-01T11:41:33Z

EDITED:
You are right.

From 5012ff51214e8f12242d8c7ad23280b778a17b56 Mon Sep 17 00:00:00 2001
Date: Mon, 1 Jun 2015 14:39:16 +0200
Subject: [PATCH] #14817

---
 src/server/game/Entities/Unit/Unit.cpp            | 22 ++++++++++++++--------
 src/server/game/Spells/Auras/SpellAuraEffects.cpp |  6 ++++++
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 6be3d65..d290b0a 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -9949,11 +9949,14 @@ uint32 Unit::SpellDamageBonusDone(Unit* victim, SpellInfo const* spellProto, uin
         DoneTotal += int32(DoneAdvertisedBenefit * coeff * factorMod);
     }

-    // Done Percentage for DOT is already calculated, no need to do it again. The percentage mod is applied in Aura::HandleAuraSpecificMods.
     float tmpDamage = (int32(pdamage) + DoneTotal) * (damagetype == DOT ? 1.0f : SpellDamagePctDone(victim, spellProto, damagetype));
-    // apply spellmod to Done damage (flat and pct)
-    if (Player* modOwner = GetSpellModOwner())
-        modOwner->ApplySpellMod(spellProto->Id, damagetype == DOT ? SPELLMOD_DOT : SPELLMOD_DAMAGE, tmpDamage);
+    // SPELLMOD_DOT will be applied in AuraEffect::HandlePeriodicDamageAurasTick.
+    if (damagetype == SPELL_DIRECT_DAMAGE)
+    {
+        // apply spellmod to Done damage (flat and pct)
+        if (Player* modOwner = GetSpellModOwner())
+            modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_DAMAGE, tmpDamage);
+    }

     return uint32(std::max(tmpDamage, 0.0f));
 }
@@ -10793,11 +10796,14 @@ uint32 Unit::SpellHealingBonusDone(Unit* victim, SpellInfo const* spellProto, ui
             DoneTotal = 0;
     }

-    // Done Percentage for DOT is already calculated, no need to do it again. The percentage mod is applied in Aura::HandleAuraSpecificMods.
     float heal = float(int32(healamount) + DoneTotal) * (damagetype == DOT ? 1.0f : SpellHealingPctDone(victim, spellProto));
-    // apply spellmod to Done amount
-    if (Player* modOwner = GetSpellModOwner())
-        modOwner->ApplySpellMod(spellProto->Id, damagetype == DOT ? SPELLMOD_DOT : SPELLMOD_DAMAGE, heal);
+    // SPELLMOD_DOT will be applied in AuraEffect::HandlePeriodicHealAurasTick.
+    if (damagetype == SPELL_DIRECT_DAMAGE)
+    {
+        // apply spellmod to Done amount
+        if (Player* modOwner = GetSpellModOwner())
+            modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_DAMAGE, heal);
+    }

     return uint32(std::max(heal, 0.0f));
 }
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 34024d7..d2df5df 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -5845,6 +5845,9 @@ void AuraEffect::HandlePeriodicDamageAurasTick(Unit* target, Unit* caster) const
         else
             damage = std::max(int32(damage * GetDonePct()), 0);

+        if (Player* modOwner = caster->GetSpellModOwner())
+            modOwner->ApplySpellMod(GetSpellInfo()->Id, SPELLMOD_DOT, damage);
+
         damage = target->SpellDamageBonusTaken(caster, GetSpellInfo(), damage, DOT, GetBase()->GetStackAmount());

         // Calculate armor mitigation
@@ -6148,6 +6151,9 @@ void AuraEffect::HandlePeriodicHealAurasTick(Unit* target, Unit* caster) const
         else
             damage = std::max(int32(damage * GetDonePct()), 0);

+        if (Player* modOwner = caster->GetSpellModOwner())
+            modOwner->ApplySpellMod(GetSpellInfo()->Id, SPELLMOD_DOT, damage);
+
         damage = target->SpellHealingBonusTaken(caster, GetSpellInfo(), damage, DOT, GetBase()->GetStackAmount());
     }

-- 
1.9.5.msysgit.1

Shauren · 2015-06-01T11:45:03Z

Aaaaaand that is bad too :P you removed too much, float(int32(healamount) + DoneTotal) should be always there (notice its multiplied by 1.0 for DOT, not 0)

robinsch · 2015-06-01T11:52:35Z

SpellDamage(Healing)BonusDone is always called with 0. Let me quote you, "base value 0 (and 0 * anything is still 0)." :P

Shauren · 2015-06-01T12:09:28Z

Yes, for !isAreaAura case :P, otherwise its proper damage.
Also i mentioned calling ApplySpellMod just before target->Spell__BonusTaken (after if (isAreaAura) damage = caster->....) block

robinsch · 2015-06-01T12:39:42Z

From 5012ff51214e8f12242d8c7ad23280b778a17b56 Mon Sep 17 00:00:00 2001
From: robinsch <robin.schriever.hude@web.de>
Date: Mon, 1 Jun 2015 14:39:16 +0200
Subject: [PATCH] #14817

---
 src/server/game/Entities/Unit/Unit.cpp            | 22 ++++++++++++++--------
 src/server/game/Spells/Auras/SpellAuraEffects.cpp |  6 ++++++
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 6be3d65..d290b0a 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -9949,11 +9949,14 @@ uint32 Unit::SpellDamageBonusDone(Unit* victim, SpellInfo const* spellProto, uin
         DoneTotal += int32(DoneAdvertisedBenefit * coeff * factorMod);
     }

-    // Done Percentage for DOT is already calculated, no need to do it again. The percentage mod is applied in Aura::HandleAuraSpecificMods.
     float tmpDamage = (int32(pdamage) + DoneTotal) * (damagetype == DOT ? 1.0f : SpellDamagePctDone(victim, spellProto, damagetype));
-    // apply spellmod to Done damage (flat and pct)
-    if (Player* modOwner = GetSpellModOwner())
-        modOwner->ApplySpellMod(spellProto->Id, damagetype == DOT ? SPELLMOD_DOT : SPELLMOD_DAMAGE, tmpDamage);
+    // SPELLMOD_DOT will be applied in AuraEffect::HandlePeriodicDamageAurasTick.
+    if (damagetype == SPELL_DIRECT_DAMAGE)
+    {
+        // apply spellmod to Done damage (flat and pct)
+        if (Player* modOwner = GetSpellModOwner())
+            modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_DAMAGE, tmpDamage);
+    }

     return uint32(std::max(tmpDamage, 0.0f));
 }
@@ -10793,11 +10796,14 @@ uint32 Unit::SpellHealingBonusDone(Unit* victim, SpellInfo const* spellProto, ui
             DoneTotal = 0;
     }

-    // Done Percentage for DOT is already calculated, no need to do it again. The percentage mod is applied in Aura::HandleAuraSpecificMods.
     float heal = float(int32(healamount) + DoneTotal) * (damagetype == DOT ? 1.0f : SpellHealingPctDone(victim, spellProto));
-    // apply spellmod to Done amount
-    if (Player* modOwner = GetSpellModOwner())
-        modOwner->ApplySpellMod(spellProto->Id, damagetype == DOT ? SPELLMOD_DOT : SPELLMOD_DAMAGE, heal);
+    // SPELLMOD_DOT will be applied in AuraEffect::HandlePeriodicHealAurasTick.
+    if (damagetype == SPELL_DIRECT_DAMAGE)
+    {
+        // apply spellmod to Done amount
+        if (Player* modOwner = GetSpellModOwner())
+            modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_DAMAGE, heal);
+    }

     return uint32(std::max(heal, 0.0f));
 }
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 34024d7..d2df5df 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -5845,6 +5845,9 @@ void AuraEffect::HandlePeriodicDamageAurasTick(Unit* target, Unit* caster) const
         else
             damage = std::max(int32(damage * GetDonePct()), 0);

+        if (Player* modOwner = caster->GetSpellModOwner())
+            modOwner->ApplySpellMod(GetSpellInfo()->Id, SPELLMOD_DOT, damage);
+
         damage = target->SpellDamageBonusTaken(caster, GetSpellInfo(), damage, DOT, GetBase()->GetStackAmount());

         // Calculate armor mitigation
@@ -6148,6 +6151,9 @@ void AuraEffect::HandlePeriodicHealAurasTick(Unit* target, Unit* caster) const
         else
             damage = std::max(int32(damage * GetDonePct()), 0);

+        if (Player* modOwner = caster->GetSpellModOwner())
+            modOwner->ApplySpellMod(GetSpellInfo()->Id, SPELLMOD_DOT, damage);
+
         damage = target->SpellHealingBonusTaken(caster, GetSpellInfo(), damage, DOT, GetBase()->GetStackAmount());
     }

-- 
1.9.5.msysgit.1

ghost · 2015-06-01T15:01:03Z

@robinsch : do you want your #14817 (comment) made into a PR now from the patch diff above?

Closes #14817 Signed-off-by: Shauren <shauren.trinity@gmail.com>

jackpoz added Sub-Spells Branch-3.3.5a labels May 31, 2015

jackpoz mentioned this issue May 31, 2015

Unit test - PoC jackpoz/BotFarm#7

Open

6 tasks

robinsch mentioned this issue Jun 1, 2015

[3.3.5] Improved Corruption calculation error #14812

Closed

Aokromes added the Feedback-PatchFix label Jun 1, 2015

Shauren pushed a commit that referenced this issue Jun 1, 2015

Core/Auras: Fixed SPELLMOD_DOT not being applied

198ffba

Closes #14817 Signed-off-by: Shauren <shauren.trinity@gmail.com>

TrinityCoreBot closed this as completed Jun 1, 2015

TrinityCoreBot mentioned this issue Jun 1, 2015

[DEV] 3.3.5 -> 6.x cherry-picks (TDB: 335.59 & 6.02) #14419

Closed

2 tasks

ccrs mentioned this issue Jul 1, 2015

[3.3.5][Warlock] Conflagrate - wrong damage #14918

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[3.3.5] DoT damage bonus not working #14817

[3.3.5] DoT damage bonus not working #14817

jackpoz commented May 31, 2015

Keader commented May 31, 2015

jackpoz commented May 31, 2015

robinsch commented Jun 1, 2015 •

edited

Loading

Shauren commented Jun 1, 2015

robinsch commented Jun 1, 2015 •

edited

Loading

Shauren commented Jun 1, 2015

robinsch commented Jun 1, 2015

Shauren commented Jun 1, 2015

robinsch commented Jun 1, 2015

ghost commented Jun 1, 2015

[3.3.5] DoT damage bonus not working #14817

[3.3.5] DoT damage bonus not working #14817

Comments

jackpoz commented May 31, 2015

Keader commented May 31, 2015

jackpoz commented May 31, 2015

robinsch commented Jun 1, 2015 • edited Loading

Shauren commented Jun 1, 2015

robinsch commented Jun 1, 2015 • edited Loading

Shauren commented Jun 1, 2015

robinsch commented Jun 1, 2015

Shauren commented Jun 1, 2015

robinsch commented Jun 1, 2015

ghost commented Jun 1, 2015

robinsch commented Jun 1, 2015 •

edited

Loading

robinsch commented Jun 1, 2015 •

edited

Loading