*Allow 2 mind flay auras to stack.

*Rollback my last change about Conflagrate dmg calculation.

--HG--
branch : trunk

src/game/SpellEffects.cpp

@@ -484,8 +484,8 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                             (*i)->GetCasterGUID()==m_caster->GetGUID() )
                         {
                             uint32 pdamage = (*i)->GetAmount() > 0 ? (*i)->GetAmount() : 0;
+                            pdamage = m_caster->SpellDamageBonus(unitTarget, (*i)->GetSpellProto(), pdamage, DOT, (*i)->GetParentAura()->GetStackAmount());
                             damage += pdamage * 4; // 4 ticks of 3 seconds = 12 secs
-                            //damage = m_caster->SpellDamageBonus(unitTarget, (*i)->GetSpellProto(), damage, DOT, (*i)->GetParentAura()->GetStackAmount());
                             // Glyph of Conflagrate
                             if (!m_caster->HasAura(56235))
                                 unitTarget->RemoveAurasDueToSpell((*i)->GetId(), m_caster->GetGUID());

src/game/SpellMgr.cpp

@@ -2839,6 +2839,7 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2, bool
                     case SPELL_AURA_POWER_BURN_MANA:
                     case SPELL_AURA_OBS_MOD_ENERGY:
                     case SPELL_AURA_OBS_MOD_HEALTH:
+                    case SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE:
                         return false;
                     default:
                         break;