Neveragain

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

Implement King of the Jungle talent

For which repository revision was the patch created?

8276

Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread.

I didn't find any

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

me.

SQL pach

delete from spell_proc_event where entry in (48492, 48494, 48495);
insert into spell_proc_event () VALUES 
(48492, 0, 7, 524288, 0, 2048, 16384, 0, 0, 0, 0),
(48494, 0, 7, 524288, 0, 2048, 16384, 0, 0, 0, 0),
(48495, 0, 7, 524288, 0, 2048, 16384, 0, 0, 0, 0);

I think by Enrage should we check Id because it has only one rank

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 21e0270..cfdbc02 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -5746,7 +5746,11 @@ void Aura::CleanupTriggeredSpells()
        m_target->RemoveAurasDueToSpell(30070);
        return;
    }
-
+    if(m_spellProto->Id == 5229)
+    {
+        // King of the Jungle
+        m_target->RemoveAurasDueToSpell(51185);
+    }
    uint32 tSpellId = m_spellProto->EffectTriggerSpell[GetEffIndex()];
    if(!tSpellId)
        return;
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 83e1a43..81e2794 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -5372,6 +5372,30 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
                basepoints0 = triggerAmount * damage / 100;
                break;
            }
+            // King of the Jungle
+            else if (dummySpell->SpellIconID == 2850)
+            {
+                if (!procSpell)
+                    return false;
+
+                // Tiger's Fury
+                if (procSpell->SpellFamilyFlags2 & 0x800 && effIndex == 1)
+                {
+                    basepoints0 = triggerAmount;
+                    triggered_spell_id = 51178;
+                    target = this;
+                    break;
+                }                
+                // Enrage                                    
+                if (procSpell->Id == 5229 && effIndex == 0)
+                {
+                    basepoints0 = triggerAmount;
+                    triggered_spell_id = 51185;
+                    target = this;
+                    break;
+                }
+                return false;
+            }
            break;
        }
        case SPELLFAMILY_ROGUE:

In loop by ShapeShifterAuras you need break at success.

Yes I forgot that. Sorry

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

It fixes the Master Shapeshifter talent.

For which repository revision was the patch created?

8262

Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread.

Don't know.

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

Me.

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index cbf381b..0518071 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -5383,16 +5383,19 @@ void Aura::HandleShapeshiftBoosts(bool apply)
    uint32 spellId = 0;
    uint32 spellId2 = 0;
    uint32 HotWSpellId = 0;
+    uint32 MasterShaperSpellId = 0;

    switch(GetModifier()->m_miscvalue)
    {
        case FORM_CAT:
            spellId = 3025;
            HotWSpellId = 24900;
+            MasterShaperSpellId = 48420;
            break;
        case FORM_TREE:
            spellId = 5420;
            spellId2 = 34123;
+            MasterShaperSpellId = 48422;
            break;
        case FORM_TRAVEL:
            spellId = 5419;
@@ -5404,11 +5407,13 @@ void Aura::HandleShapeshiftBoosts(bool apply)
            spellId = 1178;
            spellId2 = 21178;
            HotWSpellId = 24899;
+            MasterShaperSpellId = 48418;
            break;
        case FORM_DIREBEAR:
            spellId = 9635;
            spellId2 = 21178;
            HotWSpellId = 24899;
+            MasterShaperSpellId = 48418;
            break;
        case FORM_BATTLESTANCE:
            spellId = 21156;
@@ -5423,6 +5428,7 @@ void Aura::HandleShapeshiftBoosts(bool apply)
            spellId = 24905;
            // aura from effect trigger spell
            spellId2 = 24907;
+            MasterShaperSpellId = 48421;
            break;
        case FORM_FLIGHT:
            spellId = 33948;
@@ -5471,6 +5477,21 @@ void Aura::HandleShapeshiftBoosts(bool apply)
                if (spellInfo->Stances & (1<<form))
                    m_target->CastSpell(m_target, itr->first, true, NULL, this);
            }
+
+            // Master Shapeshifter
+            if (MasterShaperSpellId)
+            {
+                Unit::AuraList const& ShapeShifterAuras = m_target->GetAurasByType(SPELL_AURA_DUMMY);
+                for(Unit::AuraList::const_iterator i = ShapeShifterAuras.begin(); i != ShapeShifterAuras.end(); i++)
+                {
+                    if ((*i)->GetSpellProto()->SpellIconID == 2851)
+                    {
+                        int32 ShiftMod = (*i)->GetModifier()->m_amount;
+                        m_target->CastCustomSpell(m_target, MasterShaperSpellId, &ShiftMod, NULL, NULL, true);
+                    }
+                }
+            }
+
            //LotP
            if (((Player*)m_target)->HasSpell(17007))
            {
@@ -5501,6 +5522,7 @@ void Aura::HandleShapeshiftBoosts(bool apply)
    {
        m_target->RemoveAurasDueToSpell(spellId);
        m_target->RemoveAurasDueToSpell(spellId2);
+        m_target->RemoveAurasDueToSpell(MasterShaperSpellId);

        Unit::AuraMap& tAuras = m_target->GetAuras();
        for (Unit::AuraMap::iterator itr = tAuras.begin(); itr != tAuras.end()

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

It will fix the proc of Shadow Embrace. Only can proc on haunt or shadow bolt cast.

For which repository revision was the patch created?

8232

Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread.

Don't know.

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

me.

DELETE FROM `spell_proc_event` where entry in (32385, 32387, 32392, 32393, 32394);
INSERT INTO `spell_proc_event` () VALUES
(32385, 0x00000000,  5, 0x00000001, 0x00040000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
(32387, 0x00000000,  5, 0x00000001, 0x00040000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
(32392, 0x00000000,  5, 0x00000001, 0x00040000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
(32393, 0x00000000,  5, 0x00000001, 0x00040000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
(32394, 0x00000000,  5, 0x00000001, 0x00040000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0);