*Correct damage of Faerie Fire (feral)

*Trigger passive aura for shadowform.

--HG--
branch : trunk

2 files changed, 15 insertions, 1 deletions

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index bb4364f8acf..2dd24dcfc6c 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -2723,6 +2723,18 @@ void Spell::cast(bool skipCheck)
                 m_preCastSpell = 23230;                                // Blood Fury - Healing Reduction
             break;
         }
+        case SPELLFAMILY_DRUID:
+        {
+            // Faerie Fire (Feral)
+            if (m_spellInfo->SpellFamilyFlags[0] & 0x00000400)
+            {
+                // Trigger only if has correct shapeshift for triggered spell
+                SpellEntry const * spellInfo = sSpellStore.LookupEntry(60089);
+                if (GetErrorAtShapeshiftedCast(spellInfo, m_caster->m_form) == SPELL_CAST_OK)
+                    m_preCastSpell = 60089;
+            }
+            break;
+        }
     }
     // traded items have trade slot instead of guid in m_itemTargetGUID
     // set to real guid to be sent later to the client
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 287376c7618..a43d748849b 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -1456,10 +1456,12 @@ void AuraEffect::HandleShapeshiftBoosts(bool apply)
             spellId  = 27792;
             spellId2 = 27795;                               // must be second, this important at aura remove to prevent to early iterator invalidation.
             break;
+        case FORM_SHADOW:
+            spellId = 49868;
+            break;
         case FORM_GHOUL:
         case FORM_GHOSTWOLF:
         case FORM_AMBIENT:
-        case FORM_SHADOW:
         case FORM_STEALTH:
         case FORM_CREATURECAT:
         case FORM_CREATUREBEAR: