Merge pull request #4244 from Warpten/master

Core/Spells: Fix Earthen Power

src/server/game/Entities/Unit/Unit.cpp

@@ -7003,26 +7003,6 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
         {
             switch (dummySpell->Id)
             {
-                // Earthen Power (Rank 1, 2)
-                case 51523:
-                case 51524:
-                {
-                    // Totem itself must be a caster of this spell
-                    Unit* caster = NULL;
-                    for (ControlList::iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr) {
-                        if ((*itr)->GetEntry() != 2630)
-                            continue;
-
-                        caster = *itr;
-                        break;
-                    }
-
-                    if (!caster)
-                        return false;
-
-                    caster->CastSpell(caster, 59566, true, castItem, triggeredByAura, originalCaster);
-                    return true;
-                }
                 // Tidal Force
                 case 55198:
                 {

src/server/scripts/Spells/spell_shaman.cpp

@@ -34,8 +34,8 @@ enum ShamanSpells
     SHAMAN_SPELL_EXHAUSTION                = 57723,
 
     // For Earthen Power
-    SHAMAN_TOTEM_SPELL_EARTHBIND_TOTEM  = 6474, //Spell casted by totem
+    SHAMAN_TOTEM_SPELL_EARTHBIND_TOTEM     = 6474,
-    SHAMAN_TOTEM_SPELL_EARTHEN_POWER    = 59566, //Spell witch remove snare effect
+    SHAMAN_TOTEM_SPELL_EARTHEN_POWER       = 59566,
 };
 
 // 51474 - Astral shift
@@ -215,9 +215,11 @@ class spell_sha_earthbind_totem : public SpellScriptLoader
             {
                 Unit* target = GetTarget();
                 if (Unit* caster = aurEff->GetBase()->GetCaster())
-                    if (AuraEffect* aur = caster->GetDummyAuraEffect(SPELLFAMILY_SHAMAN, 2289, 0))
+                    if (TempSummon* summon = caster->ToTempSummon())
-                        if (roll_chance_i(aur->GetBaseAmount()))
+                        if (Unit* owner = summon->GetOwner())
-                            target->CastSpell(target, SHAMAN_TOTEM_SPELL_EARTHEN_POWER, true, NULL, aurEff);
+                            if (AuraEffect* aur = owner->GetDummyAuraEffect(SPELLFAMILY_SHAMAN, 2289, 0))
+                                if (roll_chance_i(aur->GetBaseAmount()) && target->HasAuraWithMechanic(1 << MECHANIC_SNARE))
+                                    caster->CastSpell(caster, SHAMAN_TOTEM_SPELL_EARTHEN_POWER, true, NULL, aurEff);
             }
 
             void Register()