merge

--HG--
branch : trunk

1 files changed, 6 insertions, 1 deletions

diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 8d6d0bc7ae8..1e3c1d78dfe 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -4211,7 +4211,12 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
                 }
                 if (!spellInfo)
                     break;
-                m_caster->CastSpell(unitTarget, spellInfo, true);
+                int32 count = 1;
+                // Glyph of Devastate
+                if (AuraEffect * aurEff = m_caster->GetDummyAura(58388))
+                    count += aurEff->GetAmount();
+                for (;count>0;count--)
+                    m_caster->CastSpell(unitTarget, spellInfo, true);
                 if (stack)
                     spell_bonus += stack * CalculateDamage(2, unitTarget);
             }