*Merge

--HG--
branch : trunk

1 files changed, 6 insertions, 2 deletions

diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 24274cf19dd..f29c883a5f4 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -3364,6 +3364,8 @@ void Spell::EffectSummonType(uint32 i)
                     float radius = GetSpellRadiusForHostile(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[i]));
 
                     int32 amount = damage > 0 ? damage : 1;
+                    if (m_spellInfo->Id == 18662) // Curse of Doom
+                        amount = 1;
 
                     for(int32 count = 0; count < amount; ++count)
                     {
@@ -4938,6 +4940,10 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                     unitTarget->CastSpell(unitTarget, damage, false);
                     break;
                 }
+                case 53110: // Devour Humanoid
+                    if(unitTarget)
+                        unitTarget->CastSpell(m_caster, damage, true);
+                    return;
                 // Winged Steed of the Ebon Blade
                 case 54729:
                 {
@@ -6651,8 +6657,6 @@ void Spell::SummonGuardian(uint32 entry, SummonPropertiesEntry const *properties
     switch(m_spellInfo->Id)
     {
         case 1122: // Inferno
-        case 18662: // Curse of Doom
-            amount = 1;
             break;
     }
     int32 duration = GetSpellDuration(m_spellInfo);