[9133][fix]Combustion

[Auntie Mangos]

What bug does the patch fix? What features does the patch add?

fixes Combustion

For which repository revision was the patch created?

9095

Is there a thread in the bug report section or at lighthouse?

http://getmangos.eu/community/showthread.php?11559-[bUG]Combustion-9909

Who has been writing this patch? Please include either forum user names or email addresses.

Me

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 1d3c734..656350a 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -12179,6 +12179,7 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag
            case SPELL_AURA_MANA_SHIELD:
            case SPELL_AURA_PERIODIC_DUMMY:
            case SPELL_AURA_OBS_MOD_MANA:
+            case SPELL_AURA_ADD_PCT_MODIFIER:
            case SPELL_AURA_DUMMY:
            {
                sLog.outDebug("ProcDamageAndSpell: casting spell id %u (triggered by %s dummy aura of spell %u)", spellInfo->Id,(isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId());

[KAPATEJIb]

yeah, good fix.

and spell have incorrect spell proc info. This once i found in trinity core repository (author n0n4m3)

UPDATE spell_proc_event SET SchoolMask = 4, spellFamilyMask1 = 200776, spellFamilyMask0 = 146800663 WHERE entry = 11129;

Tested in game - works good.

[laise]

if(Player* modOwner = GetSpellModOwner())

modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_CRIT_DAMAGE_BONUS, crit_bonus);

in Unit::SpellCriticalDamageBonus should deal with the bonus... and its not chance to crit it is - crit damage bonus

[ascent]

hm? i cant see this topic

[KAPATEJIb]

Fix for bug with reseting talents with active Combustion aura, maybe for other cases when player cancel aura 11129 and still have 28682 buff. Original author n0n4m3 from Trinity Core

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 5498286..a640c5b 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -1376,6 +1376,11 @@ void Aura::HandleAddModifier(bool apply, bool Real)
    if(m_modifier.m_miscvalue >= MAX_SPELLMOD)
        return;

+    if (m_spellProto->Id == 11129 && !apply)
+    {
+        m_target->RemoveAurasDueToSpell(28682);
+    }
+
    if (apply)
    {
        // Add custom charges for some mod aura

[hentai01]

I'm trying to use this patch but it's not working.

I got the code and paste on notepad++ saved as deathgrip.patch on my mangos source and used the follow commands on gui bash:

$ git apply < deathgrip.patch

shows me that problem:

Help =/

[VladimirMangos]

yeah, good fix.

and spell have incorrect spell proc info. This once i found in trinity core repository (author n0n4m3)

UPDATE spell_proc_event SET SchoolMask = 4, spellFamilyMask1 = 200776, spellFamilyMask0 = 146800663 WHERE entry = 11129;

Tested in game - works good.

Not see any reason use this: we have same req. for spell

(11119, 0x00000004, 3, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0),

[VladimirMangos]

Fix for bug with reseting talents with active Combustion aura, maybe for other cases when player cancel aura 11129 and still have 28682 buff. Original author n0n4m3 from Trinity Core

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 5498286..a640c5b 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -1376,6 +1376,11 @@ void Aura::HandleAddModifier(bool apply, bool Real)
    if(m_modifier.m_miscvalue >= MAX_SPELLMOD)
        return;

+    if (m_spellProto->Id == 11129 && !apply)
+    {
+        m_target->RemoveAurasDueToSpell(28682);
+    }
+
    if (apply)
    {
        // Add custom charges for some mod aura

This better do in specail function exist for like aura boosts

[laise]

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index ae7d0ff..5f328ce 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -5923,6 +5923,12 @@ void Aura::HandleSpellSpecificBoosts(bool apply)
                else
                    return;
            }
+            // remove Combustion triggered
+            else if (m_spellProto->Id == 11129 && !apply)
+            {
+                spellId1 = 28682;
+                break;
+            }
            else
                return;
            break;

[VladimirMangos]

thanks, i have same code also, but have problem: when player cancel aura by icon click then it remove 28682, not 11129. Is this correct that 11129 will still active? until 3 crit ofc

[VladimirMangos]

In [9133] with added removing main spell at stack cancel and different DB data. Thank you

[the nadie]

and the critical spell damage works fine too? or it's just the multiple stacking bug?

[cyrex]

In [9133] with added removing main spell at stack cancel and different DB data. Thank you

This is AWESOME we are now including fixes in super old revisions. Am thinking vehicle system should be included on commit 0007 hehe.