Fix Script Naxxramas/Gothik

- fix spell of adds
- fix wave schedule to use correct entry

--HG--
branch : trunk

3 files changed, 14 insertions, 6 deletions

diff --git a/sql/updates/7083_world_creature_template.sql b/sql/updates/7083_world_creature_template.sql
deleted file mode 100644
index b8d69da2a09..00000000000
--- a/sql/updates/7083_world_creature_template.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- Usually creature_template changes MUST GO to TDB
--- creature_template spell1-spell8 are in the exceptions
-UPDATE `creature_template` SET `spell8` = 27892 WHERE `entry` IN (16124, 29987);
-UPDATE `creature_template` SET `spell8` = 27928 WHERE `entry` IN (16125, 29985);
-UPDATE `creature_template` SET `spell8` = 27935 WHERE `entry` IN (16126, 29986);
diff --git a/sql/updates/7091_world_creature_template.sql b/sql/updates/7091_world_creature_template.sql
new file mode 100644
index 00000000000..f542985a919
--- /dev/null
+++ b/sql/updates/7091_world_creature_template.sql
@@ -0,0 +1,13 @@
+-- Usually creature_template changes MUST GO to TDB
+-- creature_template spell1-spell8 are in the exceptions
+
+-- Unrelenting Trainee
+UPDATE `creature_template` SET `spell1` = 55604, `spell8` = 27892 WHERE `entry` = 16124;
+UPDATE `creature_template` SET `spell1` = 55645, `spell2` = 0, `spell8` = 27892 where `entry` = 29987;
+
+-- Unrelenting Death Knight
+UPDATE `creature_template` SET `spell1` = 27825, `spell8` = 27928 WHERE `entry` IN (16125, 29985);
+
+-- Unrelenting Rider
+UPDATE `creature_template` SET `spell1` = 27831, `spell2` = 55606, `spell8` = 27935 where `entry` = 16126;
+UPDATE `creature_template` SET `spell1` = 55638, `spell2` = 55608, `spell8` = 27935 where `entry` = 29986;
diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp
index 5828bf0a345..58eced214bc 100644
--- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp
@@ -375,8 +375,8 @@ struct TRINITY_DLL_DECL boss_gothikAI : public BossAI
                             }
                         }
 
-                        ++waveCount;
                         events.ScheduleEvent(EVENT_SUMMON, waves[waveCount].time);
+                        ++waveCount;
                     }
                     else
                     {