Fix Script Naxxramas/Kel'Thuzad. Thank PrinceCreed, Scazzato88 and Gyullo.

Fixes issue #486.
Fixes issue #511.

- fix kel'thuzad not casting when entering phase 2.
- fix crash when casting Detonate Mana.

--HG--
branch : trunk

2 files changed, 4 insertions, 3 deletions

diff --git a/src/game/SpellAuraEffects.cpp b/src/game/SpellAuraEffects.cpp
index 0d640a6fa78..c881074e076 100644
--- a/src/game/SpellAuraEffects.cpp
+++ b/src/game/SpellAuraEffects.cpp
@@ -1999,14 +1999,14 @@ void AuraEffect::TriggerSpell(Unit * target, Unit * caster) const
                         return;
                     // Frost Blast
                     case 27808:
-                        caster->CastCustomSpell(29879, SPELLVALUE_BASE_POINT0, (float)target->GetMaxHealth()*0.26f, target, true, NULL, this);
+                        caster->CastCustomSpell(29879, SPELLVALUE_BASE_POINT0, (float)target->GetMaxHealth()*0.21f, target, true, NULL, this);
                         return;
                     // Detonate Mana
                     case 27819:
-                        if(int32 mana = (int32)(target->GetMaxPower(POWER_MANA) / 4))
+                        if(int32 mana = (int32)(target->GetMaxPower(POWER_MANA) / 10))
                         {
                             mana = target->ModifyPower(POWER_MANA, -mana);
-                            target->CastCustomSpell(27820, SPELLVALUE_BASE_POINT0, -mana*4, NULL, true, NULL, this, caster->GetGUID());
+                            target->CastCustomSpell(27820, SPELLVALUE_BASE_POINT0, -mana*10, target, true, NULL, this);
                         }
                         return;
                     // Inoculate Nestlewood Owlkin
diff --git a/src/scripts/northrend/naxxramas/boss_kelthuzad.cpp b/src/scripts/northrend/naxxramas/boss_kelthuzad.cpp
index e5f235e1b17..c7199661acb 100644
--- a/src/scripts/northrend/naxxramas/boss_kelthuzad.cpp
+++ b/src/scripts/northrend/naxxramas/boss_kelthuzad.cpp
@@ -206,6 +206,7 @@ struct TRINITY_DLL_DECL boss_kelthuzadAI : public BossAI
                         events.Reset();
                         me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                         me->SetReactState(REACT_AGGRESSIVE);
+                        me->InterruptNonMeleeSpells(false);
                         events.ScheduleEvent(EVENT_BOLT, urand(5000,10000));
                         events.ScheduleEvent(EVENT_NOVA, 15000);
                         events.ScheduleEvent(EVENT_DETONATE, urand(30000,40000));