Scripts/Forge of Souls:

- Devourer of Souls now removes all summoned creatures at death / party wipe
- fixed Well of Souls

2 files changed, 8 insertions, 1 deletions

diff --git a/sql/updates/world/2011_06_16_05_world_sai.sql b/sql/updates/world/2011_06_16_05_world_sai.sql
new file mode 100644
index 00000000000..368aed0d9ab
--- /dev/null
+++ b/sql/updates/world/2011_06_16_05_world_sai.sql
@@ -0,0 +1,5 @@
+UPDATE `creature_template` SET `AIName`='SmartAI',`exp`=2,`minlevel`=83,`maxlevel`=83,`baseattacktime`=2000,`flags_extra`=`flags_extra`|0x80 WHERE `entry`=36536; -- Well of Souls
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=36536;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(36536,0,0,0,54,0,0,0,0,0,0,0,11,68854,0,0,0,0,0,1,0,0,0,0,0,0,0,'Well of Souls - On summon - Cast Well of Souls');
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
index 95d33d70402..38af9ad3a47 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
@@ -55,7 +55,6 @@ enum Spells
     H_SPELL_PHANTOM_BLAST                         = 70322,
     SPELL_MIRRORED_SOUL                           = 69051,
     SPELL_WELL_OF_SOULS                           = 68820,
-    SPELL_WELL_OF_SOULS_VIS                       = 68854,
     SPELL_UNLEASHED_SOULS                         = 68939,
     SPELL_WAILING_SOULS_STARTING                  = 68912,  // Initial spell cast at begining of wailing souls phase
     SPELL_WAILING_SOULS_BEAM                      = 68875,  // the beam visual
@@ -142,6 +141,7 @@ class boss_devourer_of_souls : public CreatureScript
                 me->SetReactState(REACT_AGGRESSIVE);
 
                 events.Reset();
+                summons.DespawnAll();
 
                 threeFaceAchievement = true;
                 mirroredSoulTarget = 0;
@@ -206,6 +206,8 @@ class boss_devourer_of_souls : public CreatureScript
 
             void JustDied(Unit* /*killer*/)
             {
+                summons.DespawnAll();
+
                 Position spawnPoint = {5618.139f, 2451.873f, 705.854f, 0};
 
                 DoScriptText(RAND(SAY_FACE_SORROW_DEATH, SAY_FACE_DESIRE_DEATH), me);