Merge branch 'master' into 4.3.4

Conflicts: src/server/game/Entities/Creature/Creature.cpp src/server/game/Entities/Creature/Creature.h src/server/game/Entities/Creature/GossipDef.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Transport/Transport.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Globals/ObjectMgr.cpp src/server/game/Globals/ObjectMgr.h src/server/game/Handlers/QuestHandler.cpp src/server/game/Handlers/SpellHandler.cpp src/server/game/Handlers/TradeHandler.cpp src/server/game/Quests/QuestDef.h src/server/game/Spells/Auras/SpellAuraEffects.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp src/server/scripts/EasternKingdoms/zone_ghostlands.cpp src/server/scripts/EasternKingdoms/zone_hinterlands.cpp src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp src/server/scripts/Kalimdor/zone_azshara.cpp src/server/scripts/Kalimdor/zone_darkshore.cpp src/server/scripts/Kalimdor/zone_desolace.cpp src/server/scripts/Northrend/zone_dalaran.cpp src/tools/CMakeLists.txt
author: DDuarte <dnpd.dd@gmail.com> 2014-01-10 18:32:05 +0000
committer: DDuarte <dnpd.dd@gmail.com> 2014-01-10 18:32:05 +0000
commit: 33c2bd5ce1f4f8d20981e9f7aea90e37de0abbda (patch)
tree: 823ad5570f27e923c77203660ee7cc12e26182ec /src/server/scripts/Kalimdor
parent: 352a2682b1d531c83bd2b80704233677448e99de (diff)
parent: a63780fd90701ed81a0a5f2030e82ab1f6927ab4 (diff)
44 files changed, 738 insertions, 1087 deletions
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
index e74ed93bc66..ac1403a26ec 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
@@ -73,7 +73,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_blackfathom_deeps_eventAI(creature);
+        return GetInstanceAI<npc_blackfathom_deeps_eventAI>(creature);
     }
 
     struct npc_blackfathom_deeps_eventAI : public ScriptedAI
@@ -182,8 +182,7 @@ public:
         void JustDied(Unit* /*killer*/) OVERRIDE
         {
             if (me->IsSummon()) //we are not a normal spawn.
-                if (instance)
-                    instance->SetData(DATA_EVENT, instance->GetData(DATA_EVENT) + 1);
+                instance->SetData(DATA_EVENT, instance->GetData(DATA_EVENT) + 1);
         }
     };
 };
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
index 139eed963c1..55e28e3f19e 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
@@ -31,7 +31,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_gelihastAI(creature);
+        return GetInstanceAI<boss_gelihastAI>(creature);
     }
 
     struct boss_gelihastAI : public ScriptedAI
@@ -48,20 +48,17 @@ public:
         void Reset() OVERRIDE
         {
             netTimer = urand(2000, 4000);
-            if (instance)
-                instance->SetData(TYPE_GELIHAST, NOT_STARTED);
+            instance->SetData(TYPE_GELIHAST, NOT_STARTED);
         }
 
         void EnterCombat(Unit* /*who*/) OVERRIDE
         {
-            if (instance)
-                instance->SetData(TYPE_GELIHAST, IN_PROGRESS);
+            instance->SetData(TYPE_GELIHAST, IN_PROGRESS);
         }
 
         void JustDied(Unit* /*killer*/) OVERRIDE
         {
-            if (instance)
-                instance->SetData(TYPE_GELIHAST, DONE);
+            instance->SetData(TYPE_GELIHAST, DONE);
         }
 
         void UpdateAI(uint32 diff) OVERRIDE
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp
index 8eeedb6e15f..e43ac0d4e7c 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp
@@ -36,7 +36,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_kelrisAI(creature);
+        return GetInstanceAI<boss_kelrisAI>(creature);
     }
 
     struct boss_kelrisAI : public ScriptedAI
@@ -55,22 +55,19 @@ public:
         {
             mindBlastTimer = urand(2000, 5000);
             sleepTimer = urand(9000, 12000);
-            if (instance)
-                instance->SetData(TYPE_KELRIS, NOT_STARTED);
+            instance->SetData(TYPE_KELRIS, NOT_STARTED);
         }
 
         void EnterCombat(Unit* /*who*/) OVERRIDE
         {
             Talk(SAY_AGGRO);
-            if (instance)
-                instance->SetData(TYPE_KELRIS, IN_PROGRESS);
+            instance->SetData(TYPE_KELRIS, IN_PROGRESS);
         }
 
         void JustDied(Unit* /*killer*/) OVERRIDE
         {
             Talk(SAY_DEATH);
-            if (instance)
-                instance->SetData(TYPE_KELRIS, DONE);
+            instance->SetData(TYPE_KELRIS, DONE);
         }
 
         void UpdateAI(uint32 diff) OVERRIDE
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
index 52f706d5626..fa31628268b 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
@@ -47,7 +47,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_anetheronAI(creature);
+        return GetInstanceAI<boss_anetheronAI>(creature);
     }
 
     struct boss_anetheronAI : public hyjal_trashAI
@@ -83,9 +83,10 @@ public:
             Talk(SAY_ONAGGRO);
         }
 
-        void KilledUnit(Unit* /*victim*/) OVERRIDE
+        void KilledUnit(Unit* who) OVERRIDE
         {
-            Talk(SAY_ONSLAY);
+            if (who->GetTypeId() == TYPEID_PLAYER)
+                Talk(SAY_ONSLAY);
         }
 
         void WaypointReached(uint32 waypointId) OVERRIDE
@@ -115,19 +116,16 @@ public:
                 if (!go)
                 {
                     go = true;
-                    if (instance)
-                    {
-                        AddWaypoint(0, 4896.08f,    -1576.35f,    1333.65f);
-                        AddWaypoint(1, 4898.68f,    -1615.02f,    1329.48f);
-                        AddWaypoint(2, 4907.12f,    -1667.08f,    1321.00f);
-                        AddWaypoint(3, 4963.18f,    -1699.35f,    1340.51f);
-                        AddWaypoint(4, 4989.16f,    -1716.67f,    1335.74f);
-                        AddWaypoint(5, 5026.27f,    -1736.89f,    1323.02f);
-                        AddWaypoint(6, 5037.77f,    -1770.56f,    1324.36f);
-                        AddWaypoint(7, 5067.23f,    -1789.95f,    1321.17f);
-                        Start(false, true);
-                        SetDespawnAtEnd(false);
-                    }
+                    AddWaypoint(0, 4896.08f,    -1576.35f,    1333.65f);
+                    AddWaypoint(1, 4898.68f,    -1615.02f,    1329.48f);
+                    AddWaypoint(2, 4907.12f,    -1667.08f,    1321.00f);
+                    AddWaypoint(3, 4963.18f,    -1699.35f,    1340.51f);
+                    AddWaypoint(4, 4989.16f,    -1716.67f,    1335.74f);
+                    AddWaypoint(5, 5026.27f,    -1736.89f,    1323.02f);
+                    AddWaypoint(6, 5037.77f,    -1770.56f,    1324.36f);
+                    AddWaypoint(7, 5067.23f,    -1789.95f,    1321.17f);
+                    Start(false, true);
+                    SetDespawnAtEnd(false);
                 }
             }
 
@@ -179,17 +177,15 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_towering_infernalAI(creature);
+        return GetInstanceAI<npc_towering_infernalAI>(creature);
     }
 
     struct npc_towering_infernalAI : public ScriptedAI
     {
         npc_towering_infernalAI(Creature* creature) : ScriptedAI(creature)
         {
-            AnetheronGUID = 0;
             instance = creature->GetInstanceScript();
-            if (instance)
-                AnetheronGUID = instance->GetData64(DATA_ANETHERON);
+            AnetheronGUID = instance->GetData64(DATA_ANETHERON);
         }
 
         uint32 ImmolationTimer;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
index 41cc1d0241d..2708b39e8a8 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
@@ -83,7 +83,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_ancient_wispAI(creature);
+        return GetInstanceAI<npc_ancient_wispAI>(creature);
     }
 
     struct npc_ancient_wispAI : public ScriptedAI
@@ -102,8 +102,7 @@ public:
         {
             CheckTimer = 1000;
 
-            if (instance)
-                ArchimondeGUID = instance->GetData64(DATA_ARCHIMONDE);
+            ArchimondeGUID = instance->GetData64(DATA_ARCHIMONDE);
 
             me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
         }
@@ -239,7 +238,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_archimondeAI(creature);
+        return GetInstanceAI<boss_archimondeAI>(creature);
     }
 
     struct boss_archimondeAI : public hyjal_trashAI
@@ -275,8 +274,7 @@ public:
 
         void Reset() OVERRIDE
         {
-            if (instance)
-                instance->SetData(DATA_ARCHIMONDEEVENT, NOT_STARTED);
+            instance->SetData(DATA_ARCHIMONDEEVENT, NOT_STARTED);
 
             DoomfireSpiritGUID = 0;
             damageTaken = 0;
@@ -308,8 +306,7 @@ public:
             Talk(SAY_AGGRO);
             DoZoneInCombat();
 
-            if (instance)
-                instance->SetData(DATA_ARCHIMONDEEVENT, IN_PROGRESS);
+            instance->SetData(DATA_ARCHIMONDEEVENT, IN_PROGRESS);
         }
 
         void KilledUnit(Unit* victim) OVERRIDE
@@ -350,8 +347,7 @@ public:
             hyjal_trashAI::JustDied(killer);
             Talk(SAY_DEATH);
 
-            if (instance)
-                instance->SetData(DATA_ARCHIMONDEEVENT, DONE);
+            instance->SetData(DATA_ARCHIMONDEEVENT, DONE);
         }
 
         bool CanUseFingerOfDeath()
@@ -471,19 +467,16 @@ public:
         {
             if (!me->IsInCombat())
             {
-                if (instance)
+                // Do not let the raid skip straight to Archimonde. Visible and hostile ONLY if Azagalor is finished.
+                if ((instance->GetData(DATA_AZGALOREVENT) < DONE) && (me->IsVisible() || (me->getFaction() != 35)))
                 {
-                    // Do not let the raid skip straight to Archimonde. Visible and hostile ONLY if Azagalor is finished.
-                    if ((instance->GetData(DATA_AZGALOREVENT) < DONE) && (me->IsVisible() || (me->getFaction() != 35)))
-                    {
-                        me->SetVisible(false);
-                        me->setFaction(35);
-                    }
-                    else if ((instance->GetData(DATA_AZGALOREVENT) >= DONE) && (!me->IsVisible() || (me->getFaction() == 35)))
-                    {
-                        me->setFaction(1720);
-                        me->SetVisible(true);
-                    }
+                    me->SetVisible(false);
+                    me->setFaction(35);
+                }
+                else if ((instance->GetData(DATA_AZGALOREVENT) >= DONE) && (!me->IsVisible() || (me->getFaction() == 35)))
+                {
+                    me->setFaction(1720);
+                    me->SetVisible(true);
                 }
 
                 if (DrainNordrassilTimer <= diff)
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
index dd486df16ed..c4d68f76df4 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
@@ -48,7 +48,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_azgalorAI(creature);
+        return GetInstanceAI<boss_azgalorAI>(creature);
     }
 
     struct boss_azgalorAI : public hyjal_trashAI
@@ -121,19 +121,16 @@ public:
                 if (!go)
                 {
                     go = true;
-                    if (instance)
-                    {
-                        AddWaypoint(0, 5492.91f,    -2404.61f,    1462.63f);
-                        AddWaypoint(1, 5531.76f,    -2460.87f,    1469.55f);
-                        AddWaypoint(2, 5554.58f,    -2514.66f,    1476.12f);
-                        AddWaypoint(3, 5554.16f,    -2567.23f,    1479.90f);
-                        AddWaypoint(4, 5540.67f,    -2625.99f,    1480.89f);
-                        AddWaypoint(5, 5508.16f,    -2659.2f,    1480.15f);
-                        AddWaypoint(6, 5489.62f,    -2704.05f,    1482.18f);
-                        AddWaypoint(7, 5457.04f,    -2726.26f,    1485.10f);
-                        Start(false, true);
-                        SetDespawnAtEnd(false);
-                    }
+                    AddWaypoint(0, 5492.91f,    -2404.61f,    1462.63f);
+                    AddWaypoint(1, 5531.76f,    -2460.87f,    1469.55f);
+                    AddWaypoint(2, 5554.58f,    -2514.66f,    1476.12f);
+                    AddWaypoint(3, 5554.16f,    -2567.23f,    1479.90f);
+                    AddWaypoint(4, 5540.67f,    -2625.99f,    1480.89f);
+                    AddWaypoint(5, 5508.16f,    -2659.2f,    1480.15f);
+                    AddWaypoint(6, 5489.62f,    -2704.05f,    1482.18f);
+                    AddWaypoint(7, 5457.04f,    -2726.26f,    1485.10f);
+                    Start(false, true);
+                    SetDespawnAtEnd(false);
                 }
             }
 
@@ -186,17 +183,15 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_lesser_doomguardAI(creature);
+        return GetInstanceAI<npc_lesser_doomguardAI>(creature);
     }
 
     struct npc_lesser_doomguardAI : public hyjal_trashAI
     {
         npc_lesser_doomguardAI(Creature* creature) : hyjal_trashAI(creature)
         {
-            AzgalorGUID = 0;
             instance = creature->GetInstanceScript();
-            if (instance)
-                AzgalorGUID = instance->GetData64(DATA_AZGALOR);
+            AzgalorGUID = instance->GetData64(DATA_AZGALOR);
         }
 
         uint32 CrippleTimer;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
index 0c918f0b0ca..eb4ef16889f 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
@@ -49,7 +49,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_kazrogalAI(creature);
+        return GetInstanceAI<boss_kazrogalAI>(creature);
     }
 
     struct boss_kazrogalAI : public hyjal_trashAI
@@ -117,19 +117,16 @@ public:
                 if (!go)
                 {
                     go = true;
-                    if (instance)
-                    {
-                        AddWaypoint(0, 5492.91f,    -2404.61f,    1462.63f);
-                        AddWaypoint(1, 5531.76f,    -2460.87f,    1469.55f);
-                        AddWaypoint(2, 5554.58f,    -2514.66f,    1476.12f);
-                        AddWaypoint(3, 5554.16f,    -2567.23f,    1479.90f);
-                        AddWaypoint(4, 5540.67f,    -2625.99f,    1480.89f);
-                        AddWaypoint(5, 5508.16f,    -2659.2f,    1480.15f);
-                        AddWaypoint(6, 5489.62f,    -2704.05f,    1482.18f);
-                        AddWaypoint(7, 5457.04f,    -2726.26f,    1485.10f);
-                        Start(false, true);
-                        SetDespawnAtEnd(false);
-                    }
+                    AddWaypoint(0, 5492.91f,    -2404.61f,    1462.63f);
+                    AddWaypoint(1, 5531.76f,    -2460.87f,    1469.55f);
+                    AddWaypoint(2, 5554.58f,    -2514.66f,    1476.12f);
+                    AddWaypoint(3, 5554.16f,    -2567.23f,    1479.90f);
+                    AddWaypoint(4, 5540.67f,    -2625.99f,    1480.89f);
+                    AddWaypoint(5, 5508.16f,    -2659.2f,    1480.15f);
+                    AddWaypoint(6, 5489.62f,    -2704.05f,    1482.18f);
+                    AddWaypoint(7, 5457.04f,    -2726.26f,    1485.10f);
+                    Start(false, true);
+                    SetDespawnAtEnd(false);
                 }
             }
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
index c163e7c0f1f..00c82b11171 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
@@ -44,7 +44,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_rage_winterchillAI(creature);
+        return GetInstanceAI<boss_rage_winterchillAI>(creature);
     }
 
     struct boss_rage_winterchillAI : public hyjal_trashAI
@@ -112,19 +112,16 @@ public:
                 if (!go)
                 {
                     go = true;
-                    if (instance)
-                    {
-                        AddWaypoint(0, 4896.08f,    -1576.35f,    1333.65f);
-                        AddWaypoint(1, 4898.68f,    -1615.02f,    1329.48f);
-                        AddWaypoint(2, 4907.12f,    -1667.08f,    1321.00f);
-                        AddWaypoint(3, 4963.18f,    -1699.35f,    1340.51f);
-                        AddWaypoint(4, 4989.16f,    -1716.67f,    1335.74f);
-                        AddWaypoint(5, 5026.27f,    -1736.89f,    1323.02f);
-                        AddWaypoint(6, 5037.77f,    -1770.56f,    1324.36f);
-                        AddWaypoint(7, 5067.23f,    -1789.95f,    1321.17f);
-                        Start(false, true);
-                        SetDespawnAtEnd(false);
-                    }
+                    AddWaypoint(0, 4896.08f,    -1576.35f,    1333.65f);
+                    AddWaypoint(1, 4898.68f,    -1615.02f,    1329.48f);
+                    AddWaypoint(2, 4907.12f,    -1667.08f,    1321.00f);
+                    AddWaypoint(3, 4963.18f,    -1699.35f,    1340.51f);
+                    AddWaypoint(4, 4989.16f,    -1716.67f,    1335.74f);
+                    AddWaypoint(5, 5026.27f,    -1736.89f,    1323.02f);
+                    AddWaypoint(6, 5037.77f,    -1770.56f,    1324.36f);
+                    AddWaypoint(7, 5067.23f,    -1789.95f,    1321.17f);
+                    Start(false, true);
+                    SetDespawnAtEnd(false);
                 }
             }
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
index f4d3f559585..a352c3493ee 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
@@ -102,6 +102,9 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
+        if (!creature->GetInstanceScript())
+            return NULL;
+
         hyjalAI* ai = new hyjalAI(creature);
 
         ai->Reset();
@@ -184,6 +187,9 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
+        if (!creature->GetInstanceScript())
+            return NULL;
+
         hyjalAI* ai = new hyjalAI(creature);
 
         ai->Reset();
@@ -209,6 +215,9 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
+        if (!creature->GetInstanceScript())
+            return NULL;
+
         hyjalAI* ai = new hyjalAI(creature);
         ai->Reset();
         ai->EnterEvadeMode();
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
index 6d73485d98b..70b0489447f 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
@@ -397,17 +397,14 @@ void hyjalAI::Reset()
     memset(Spells, 0, sizeof(Spell) * HYJAL_AI_MAX_SPELLS);
 
     //Reset Instance Data for trash count
-    if (instance)
+    if ((!instance->GetData(DATA_ALLIANCE_RETREAT) && me->GetEntry() == JAINA) || (instance->GetData(DATA_ALLIANCE_RETREAT) && me->GetEntry() == THRALL))
     {
-        if ((!instance->GetData(DATA_ALLIANCE_RETREAT) && me->GetEntry() == JAINA) || (instance->GetData(DATA_ALLIANCE_RETREAT) && me->GetEntry() == THRALL))
-        {
-            //Reset World States
-            instance->DoUpdateWorldState(WORLD_STATE_WAVES, 0);
-            instance->DoUpdateWorldState(WORLD_STATE_ENEMY, 0);
-            instance->DoUpdateWorldState(WORLD_STATE_ENEMYCOUNT, 0);
-            instance->SetData(DATA_RESET_TRASH_COUNT, 0);
-        }
-    } else TC_LOG_ERROR("scripts", ERROR_INST_DATA);
+        //Reset World States
+        instance->DoUpdateWorldState(WORLD_STATE_WAVES, 0);
+        instance->DoUpdateWorldState(WORLD_STATE_ENEMY, 0);
+        instance->DoUpdateWorldState(WORLD_STATE_ENEMYCOUNT, 0);
+        instance->SetData(DATA_RESET_TRASH_COUNT, 0);
+    }
 
     //Visibility
     DoHide = true;
@@ -517,11 +514,8 @@ void hyjalAI::SummonCreature(uint32 entry, float Base[4][3])
                 CAST_AI(hyjal_trashAI, creature->AI())->IsEvent = true;
                 break;
         }
-        if (instance)
-        {
-            if (instance->GetData(DATA_RAIDDAMAGE) < MINRAIDDAMAGE)
-                creature->SetDisableReputationGain(true);//no repu for solo farming
-        }
+        if (instance->GetData(DATA_RAIDDAMAGE) < MINRAIDDAMAGE)
+            creature->SetDisableReputationGain(true);//no repu for solo farming
         // Check if Creature is a boss.
         if (creature->isWorldBoss())
         {
@@ -538,11 +532,6 @@ void hyjalAI::SummonNextWave(const Wave wave[18], uint32 Count, float Base[4][3]
     if (rand()%4 == 0)
         Talk(RALLY);
 
-    if (!instance)
-    {
-        TC_LOG_ERROR("scripts", ERROR_INST_DATA);
-        return;
-    }
     InfernalCount = 0;//reset infernal count every new wave
 
     EnemyCount = instance->GetData(DATA_TRASH);
@@ -612,41 +601,34 @@ void hyjalAI::StartEvent(Player* player)
 
 uint32 hyjalAI::GetInstanceData(uint32 Event)
 {
-    if (instance)
-        return instance->GetData(Event);
-    else TC_LOG_ERROR("scripts", ERROR_INST_DATA);
-
-    return 0;
+    return instance->GetData(Event);
 }
 
 void hyjalAI::Retreat()
 {
-    if (instance)
-    {
-        instance->SetData(TYPE_RETREAT, SPECIAL);
+    instance->SetData(TYPE_RETREAT, SPECIAL);
 
-        if (Faction == 0)
-        {
-            instance->SetData(DATA_ALLIANCE_RETREAT, 1);
-            AddWaypoint(0, JainaWPs[0][0], JainaWPs[0][1], JainaWPs[0][2]);
-            AddWaypoint(1, JainaWPs[1][0], JainaWPs[1][1], JainaWPs[1][2]);
-            Start(false, false);
-            SetDespawnAtEnd(false);//move to center of alliance base
-        }
-        if (Faction == 1)
+    if (Faction == 0)
+    {
+        instance->SetData(DATA_ALLIANCE_RETREAT, 1);
+        AddWaypoint(0, JainaWPs[0][0], JainaWPs[0][1], JainaWPs[0][2]);
+        AddWaypoint(1, JainaWPs[1][0], JainaWPs[1][1], JainaWPs[1][2]);
+        Start(false, false);
+        SetDespawnAtEnd(false);//move to center of alliance base
+    }
+    if (Faction == 1)
+    {
+        instance->SetData(DATA_HORDE_RETREAT, 1);
+        Creature* JainaDummy = me->SummonCreature(JAINA, JainaDummySpawn[0][0], JainaDummySpawn[0][1], JainaDummySpawn[0][2], JainaDummySpawn[0][3], TEMPSUMMON_TIMED_DESPAWN, 60000);
+        if (JainaDummy)
         {
-            instance->SetData(DATA_HORDE_RETREAT, 1);
-            Creature* JainaDummy = me->SummonCreature(JAINA, JainaDummySpawn[0][0], JainaDummySpawn[0][1], JainaDummySpawn[0][2], JainaDummySpawn[0][3], TEMPSUMMON_TIMED_DESPAWN, 60000);
-            if (JainaDummy)
-            {
-                JainaDummy->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
-                CAST_AI(hyjalAI, JainaDummy->AI())->IsDummy = true;
-                DummyGuid = JainaDummy->GetGUID();
-            }
-            AddWaypoint(0, JainaDummySpawn[1][0], JainaDummySpawn[1][1], JainaDummySpawn[1][2]);
-            Start(false, false);
-            SetDespawnAtEnd(false);//move to center of alliance base
+            JainaDummy->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+            CAST_AI(hyjalAI, JainaDummy->AI())->IsDummy = true;
+            DummyGuid = JainaDummy->GetGUID();
         }
+        AddWaypoint(0, JainaDummySpawn[1][0], JainaDummySpawn[1][1], JainaDummySpawn[1][2]);
+        Start(false, false);
+        SetDespawnAtEnd(false);//move to center of alliance base
     }
     SpawnVeins();
     Overrun = true;
@@ -681,8 +663,6 @@ void hyjalAI::SpawnVeins()
 
 void hyjalAI::DeSpawnVeins()
 {
-    if (!instance)
-        return;
     if (Faction == 1)
     {
         Creature* unit=Unit::GetCreature((*me), instance->GetData64(DATA_JAINAPROUDMOORE));
@@ -841,8 +821,7 @@ void hyjalAI::UpdateAI(uint32 diff)
                     CheckTimer = 0;
                     me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
                     BossGUID[i] = 0;
-                    if (instance)
-                        instance->DoUpdateWorldState(WORLD_STATE_ENEMY, 0); // Reset world state for enemies to disable it
+                    instance->DoUpdateWorldState(WORLD_STATE_ENEMY, 0); // Reset world state for enemies to disable it
                 }
             }
         }
@@ -858,7 +837,7 @@ void hyjalAI::UpdateAI(uint32 diff)
         {
             if (SpellTimer[i] <= diff)
             {
-                if (me->IsNonMeleeSpellCasted(false))
+                if (me->IsNonMeleeSpellCast(false))
                     me->InterruptNonMeleeSpells(false);
 
                 Unit* target = NULL;
@@ -899,18 +878,16 @@ void hyjalAI::JustDied(Unit* /*killer*/)
     RespawnTimer = 120000;
     Talk(DEATH);
     Summons.DespawnAll();//despawn all wave's summons
-    if (instance)
-    {//reset encounter if boss is despawned (ex: thrall is killed, boss despawns, event stucks at inprogress)
-        if (instance->GetData(DATA_RAGEWINTERCHILLEVENT) == IN_PROGRESS)
-            instance->SetData(DATA_RAGEWINTERCHILLEVENT, NOT_STARTED);
-        if (instance->GetData(DATA_ANETHERONEVENT) == IN_PROGRESS)
-            instance->SetData(DATA_ANETHERONEVENT, NOT_STARTED);
-        if (instance->GetData(DATA_KAZROGALEVENT) == IN_PROGRESS)
-            instance->SetData(DATA_KAZROGALEVENT, NOT_STARTED);
-        if (instance->GetData(DATA_AZGALOREVENT) == IN_PROGRESS)
-            instance->SetData(DATA_AZGALOREVENT, NOT_STARTED);
-        instance->SetData(DATA_RESET_RAIDDAMAGE, 0);//reset damage on die
-    }
+    //reset encounter if boss is despawned (ex: thrall is killed, boss despawns, event stucks at inprogress)
+    if (instance->GetData(DATA_RAGEWINTERCHILLEVENT) == IN_PROGRESS)
+        instance->SetData(DATA_RAGEWINTERCHILLEVENT, NOT_STARTED);
+    if (instance->GetData(DATA_ANETHERONEVENT) == IN_PROGRESS)
+        instance->SetData(DATA_ANETHERONEVENT, NOT_STARTED);
+    if (instance->GetData(DATA_KAZROGALEVENT) == IN_PROGRESS)
+        instance->SetData(DATA_KAZROGALEVENT, NOT_STARTED);
+    if (instance->GetData(DATA_AZGALOREVENT) == IN_PROGRESS)
+        instance->SetData(DATA_AZGALOREVENT, NOT_STARTED);
+    instance->SetData(DATA_RESET_RAIDDAMAGE, 0);//reset damage on die
 }
 
 void hyjalAI::HideNearPos(float x, float y)
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
index 9245a0c648f..0a369154ad4 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
@@ -195,8 +195,7 @@ void hyjal_trashAI::DamageTaken(Unit* done_by, uint32 &damage)
     if (done_by->GetTypeId() == TYPEID_PLAYER || done_by->IsPet())
     {
         damageTaken += damage;
-        if (instance)
-            instance->SetData(DATA_RAIDDAMAGE, damage);//store raid's damage
+        instance->SetData(DATA_RAIDDAMAGE, damage);//store raid's damage
     }
 }
 
@@ -399,9 +398,6 @@ void hyjal_trashAI::UpdateAI(uint32 /*diff*/)
 
 void hyjal_trashAI::JustDied(Unit* /*killer*/)
 {
-    if (!instance)
-        return;
-
     if (IsEvent && !me->isWorldBoss())
         instance->SetData(DATA_TRASH, 0);//signal trash is dead
 
@@ -488,16 +484,13 @@ public:
                     me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                     me->SetDisplayId(me->GetUInt32Value(UNIT_FIELD_NATIVEDISPLAYID));
                     CanMove = true;
-                    if (instance)
+                    if (instance->GetData(DATA_ALLIANCE_RETREAT) && !instance->GetData(DATA_HORDE_RETREAT))
                     {
-                        if (instance->GetData(DATA_ALLIANCE_RETREAT) && !instance->GetData(DATA_HORDE_RETREAT))
-                        {
-                            Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL));
-                            if (target && target->IsAlive())
-                                me->AddThreat(target, 0.0f);
-                        } else if (instance->GetData(DATA_ALLIANCE_RETREAT) && instance->GetData(DATA_HORDE_RETREAT)){
-                            //do overrun
-                        }
+                        Unit* target = Unit::GetUnit(*me, instance->GetData64(DATA_THRALL));
+                        if (target && target->IsAlive())
+                            me->AddThreat(target, 0.0f);
+                    } else if (instance->GetData(DATA_ALLIANCE_RETREAT) && instance->GetData(DATA_HORDE_RETREAT)){
+                        //do overrun
                     }
                 } else spawnTimer -= diff;
             }
@@ -510,12 +503,9 @@ public:
                 if (!go)
                 {
                     go = true;
-                    if (instance)
-                    {
-                        AddWaypoint(0, HordeWPs[7][0]+irand(-3, 3),    HordeWPs[7][1]+irand(-3, 3),    HordeWPs[7][2]);//HordeWPs[7] infront of thrall
-                        Start(true, true);
-                        SetDespawnAtEnd(false);
-                    }
+                    AddWaypoint(0, HordeWPs[7][0]+irand(-3, 3),    HordeWPs[7][1]+irand(-3, 3),    HordeWPs[7][2]);//HordeWPs[7] infront of thrall
+                    Start(true, true);
+                    SetDespawnAtEnd(false);
                 }
             }
 
@@ -537,7 +527,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_giant_infernalAI(creature);
+        return GetInstanceAI<npc_giant_infernalAI>(creature);
     }
 };
 
@@ -548,7 +538,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_abominationAI(creature);
+        return GetInstanceAI<npc_abominationAI>(creature);
     }
 
     struct npc_abominationAI : public hyjal_trashAI
@@ -606,21 +596,18 @@ public:
                 if (!go)
                 {
                     go = true;
-                    if (instance)
+                    if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs
+                    {
+                        for (uint8 i = 0; i < 8; ++i)
+                            AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3),    HordeWPs[i][1]+irand(-3, 3),    HordeWPs[i][2]);
+                        Start(false, true);
+                        SetDespawnAtEnd(false);
+                    }else//use alliance WPs
                     {
-                        if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs
-                        {
-                            for (uint8 i = 0; i < 8; ++i)
-                                AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3),    HordeWPs[i][1]+irand(-3, 3),    HordeWPs[i][2]);
-                            Start(false, true);
-                            SetDespawnAtEnd(false);
-                        }else//use alliance WPs
-                        {
-                            for (uint8 i = 0; i < 8; ++i)
-                                AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3),    AllianceWPs[i][1]+irand(-3, 3),    AllianceWPs[i][2]);
-                            Start(false, true);
-                            SetDespawnAtEnd(false);
-                        }
+                        for (uint8 i = 0; i < 8; ++i)
+                            AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3),    AllianceWPs[i][1]+irand(-3, 3),    AllianceWPs[i][2]);
+                        Start(false, true);
+                        SetDespawnAtEnd(false);
                     }
                 }
             }
@@ -646,7 +633,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_ghoulAI(creature);
+        return GetInstanceAI<npc_ghoulAI>(creature);
     }
 
     struct npc_ghoulAI : public hyjal_trashAI
@@ -709,21 +696,18 @@ public:
                 if (!go)
                 {
                     go = true;
-                    if (instance)
+                    if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs
                     {
-                        if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs
-                        {
-                            for (uint8 i = 0; i < 8; ++i)
-                                AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3),    HordeWPs[i][1]+irand(-3, 3),    HordeWPs[i][2]);
-                            Start(false, true);
-                            SetDespawnAtEnd(false);
-                        }else//use alliance WPs
-                        {
-                            for (uint8 i = 0; i < 8; ++i)
-                                AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3),    AllianceWPs[i][1]+irand(-3, 3),    AllianceWPs[i][2]);
-                            Start(false, true);
-                            SetDespawnAtEnd(false);
-                        }
+                        for (uint8 i = 0; i < 8; ++i)
+                            AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3),    HordeWPs[i][1]+irand(-3, 3),    HordeWPs[i][2]);
+                        Start(false, true);
+                        SetDespawnAtEnd(false);
+                    }else//use alliance WPs
+                    {
+                        for (uint8 i = 0; i < 8; ++i)
+                            AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3),    AllianceWPs[i][1]+irand(-3, 3),    AllianceWPs[i][2]);
+                        Start(false, true);
+                        SetDespawnAtEnd(false);
                     }
                 }
             }
@@ -748,7 +732,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_necromancerAI(creature);
+        return GetInstanceAI<npc_necromancerAI>(creature);
     }
 
     struct npc_necromancerAI : public hyjal_trashAI
@@ -834,21 +818,18 @@ public:
                 if (!go)
                 {
                     go = true;
-                    if (instance)
+                    if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs
+                    {
+                        for (uint8 i = 0; i < 8; ++i)
+                            AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3),    HordeWPs[i][1]+irand(-3, 3),    HordeWPs[i][2]);
+                        Start(true, true);
+                        SetDespawnAtEnd(false);
+                    }else//use alliance WPs
                     {
-                        if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs
-                        {
-                            for (uint8 i = 0; i < 8; ++i)
-                                AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3),    HordeWPs[i][1]+irand(-3, 3),    HordeWPs[i][2]);
-                            Start(true, true);
-                            SetDespawnAtEnd(false);
-                        }else//use alliance WPs
-                        {
-                            for (uint8 i = 0; i < 8; ++i)
-                                AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3),    AllianceWPs[i][1]+irand(-3, 3),    AllianceWPs[i][2]);
-                            Start(true, true);
-                            SetDespawnAtEnd(false);
-                        }
+                        for (uint8 i = 0; i < 8; ++i)
+                            AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3),    AllianceWPs[i][1]+irand(-3, 3),    AllianceWPs[i][2]);
+                        Start(true, true);
+                        SetDespawnAtEnd(false);
                     }
                 }
             }
@@ -875,7 +856,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_bansheeAI(creature);
+        return GetInstanceAI<npc_bansheeAI>(creature);
     }
 
     struct npc_bansheeAI : public hyjal_trashAI
@@ -930,21 +911,18 @@ public:
                 if (!go)
                 {
                     go = true;
-                    if (instance)
+                    if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs
                     {
-                        if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs
-                        {
-                            for (uint8 i = 0; i < 8; ++i)
-                                AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3),    HordeWPs[i][1]+irand(-3, 3),    HordeWPs[i][2]);
-                            Start(false, true);
-                            SetDespawnAtEnd(false);
-                        }else//use alliance WPs
-                        {
-                            for (uint8 i = 0; i < 8; ++i)
-                                AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3),    AllianceWPs[i][1]+irand(-3, 3),    AllianceWPs[i][2]);
-                            Start(false, true);
-                            SetDespawnAtEnd(false);
-                        }
+                        for (uint8 i = 0; i < 8; ++i)
+                            AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3),    HordeWPs[i][1]+irand(-3, 3),    HordeWPs[i][2]);
+                        Start(false, true);
+                        SetDespawnAtEnd(false);
+                    }else//use alliance WPs
+                    {
+                        for (uint8 i = 0; i < 8; ++i)
+                            AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3),    AllianceWPs[i][1]+irand(-3, 3),    AllianceWPs[i][2]);
+                        Start(false, true);
+                        SetDespawnAtEnd(false);
                     }
                 }
             }
@@ -978,7 +956,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_crypt_fiendAI(creature);
+        return GetInstanceAI<npc_crypt_fiendAI>(creature);
     }
 
     struct npc_crypt_fiendAI : public hyjal_trashAI
@@ -1029,22 +1007,18 @@ public:
                 if (!go)
                 {
                     go = true;
-                    if (instance)
+                    if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs
                     {
-                        if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs
-                        {
-                            for (uint8 i = 0; i < 8; ++i)
-                                AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3),    HordeWPs[i][1]+irand(-3, 3),    HordeWPs[i][2]);
-                            Start(false, true);
-                            SetDespawnAtEnd(false);
-                        }else//use alliance WPs
-                        {
-                            for (uint8 i = 0; i < 8; ++i)
-                                AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3),    AllianceWPs[i][1]+irand(-3, 3),    AllianceWPs[i][2]);
-                            Start(false, true);
-                            SetDespawnAtEnd(false);
-                        }
-
+                        for (uint8 i = 0; i < 8; ++i)
+                            AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3),    HordeWPs[i][1]+irand(-3, 3),    HordeWPs[i][2]);
+                        Start(false, true);
+                        SetDespawnAtEnd(false);
+                    }else//use alliance WPs
+                    {
+                        for (uint8 i = 0; i < 8; ++i)
+                            AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3),    AllianceWPs[i][1]+irand(-3, 3),    AllianceWPs[i][2]);
+                        Start(false, true);
+                        SetDespawnAtEnd(false);
                     }
                 }
             }
@@ -1068,7 +1042,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_fel_stalkerAI(creature);
+        return GetInstanceAI<npc_fel_stalkerAI>(creature);
     }
 
     struct npc_fel_stalkerAI : public hyjal_trashAI
@@ -1119,22 +1093,18 @@ public:
                 if (!go)
                 {
                     go = true;
-                    if (instance)
+                    if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs
                     {
-                        if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs
-                        {
-                            for (uint8 i = 0; i < 8; ++i)
-                                AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3),    HordeWPs[i][1]+irand(-3, 3),    HordeWPs[i][2]);
-                            Start(false, true);
-                            SetDespawnAtEnd(false);
-                        }else//use alliance WPs
-                        {
-                            for (uint8 i = 0; i < 8; ++i)
-                                AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3),    AllianceWPs[i][1]+irand(-3, 3),    AllianceWPs[i][2]);
-                            Start(false, true);
-                            SetDespawnAtEnd(false);
-                        }
-
+                        for (uint8 i = 0; i < 8; ++i)
+                            AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3),    HordeWPs[i][1]+irand(-3, 3),    HordeWPs[i][2]);
+                        Start(false, true);
+                        SetDespawnAtEnd(false);
+                    }else//use alliance WPs
+                    {
+                        for (uint8 i = 0; i < 8; ++i)
+                            AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3),    AllianceWPs[i][1]+irand(-3, 3),    AllianceWPs[i][2]);
+                        Start(false, true);
+                        SetDespawnAtEnd(false);
                     }
                 }
             }
@@ -1158,7 +1128,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_frost_wyrmAI(creature);
+        return GetInstanceAI<npc_frost_wyrmAI>(creature);
     }
 
     struct npc_frost_wyrmAI : public hyjal_trashAI
@@ -1221,20 +1191,17 @@ public:
                 if (!go)
                 {
                     go = true;
-                    if (instance)
+                    if (!useFlyPath)
                     {
-                        if (!useFlyPath)
-                        {
-                            for (uint8 i = 0; i < 3; ++i)
-                                AddWaypoint(i, FrostWyrmWPs[i][0],    FrostWyrmWPs[i][1],    FrostWyrmWPs[i][2]);
-                            Start(false, true);
-                            SetDespawnAtEnd(false);
-                        }else{//fly path FlyPathWPs
-                            for (uint8 i = 0; i < 3; ++i)
-                                AddWaypoint(i, FlyPathWPs[i][0]+irand(-10, 10),    FlyPathWPs[i][1]+irand(-10, 10),    FlyPathWPs[i][2]);
-                            Start(false, true);
-                            SetDespawnAtEnd(false);
-                        }
+                        for (uint8 i = 0; i < 3; ++i)
+                            AddWaypoint(i, FrostWyrmWPs[i][0],    FrostWyrmWPs[i][1],    FrostWyrmWPs[i][2]);
+                        Start(false, true);
+                        SetDespawnAtEnd(false);
+                    }else{//fly path FlyPathWPs
+                        for (uint8 i = 0; i < 3; ++i)
+                            AddWaypoint(i, FlyPathWPs[i][0]+irand(-10, 10),    FlyPathWPs[i][1]+irand(-10, 10),    FlyPathWPs[i][2]);
+                        Start(false, true);
+                        SetDespawnAtEnd(false);
                     }
                 }
             }
@@ -1270,7 +1237,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_gargoyleAI(creature);
+        return GetInstanceAI<npc_gargoyleAI>(creature);
     }
 
     struct npc_gargoyleAI : public hyjal_trashAI
@@ -1334,20 +1301,17 @@ public:
                 if (!go)
                 {
                     go = true;
-                    if (instance)
+                    if (!useFlyPath)
                     {
-                        if (!useFlyPath)
-                        {
-                            for (uint8 i = 0; i < 3; ++i)
-                                AddWaypoint(i, GargoyleWPs[i][0]+irand(-10, 10), GargoyleWPs[i][1]+irand(-10, 10), GargoyleWPs[i][2]);
-                            Start(false, true);
-                            SetDespawnAtEnd(false);
-                        }else{//fly path FlyPathWPs
-                            for (uint8 i = 0; i < 3; ++i)
-                                AddWaypoint(i, FlyPathWPs[i][0]+irand(-10, 10),    FlyPathWPs[i][1]+irand(-10, 10),    FlyPathWPs[i][2]);
-                            Start(false, true);
-                            SetDespawnAtEnd(false);
-                        }
+                        for (uint8 i = 0; i < 3; ++i)
+                            AddWaypoint(i, GargoyleWPs[i][0]+irand(-10, 10), GargoyleWPs[i][1]+irand(-10, 10), GargoyleWPs[i][2]);
+                        Start(false, true);
+                        SetDespawnAtEnd(false);
+                    }else{//fly path FlyPathWPs
+                        for (uint8 i = 0; i < 3; ++i)
+                            AddWaypoint(i, FlyPathWPs[i][0]+irand(-10, 10),    FlyPathWPs[i][1]+irand(-10, 10),    FlyPathWPs[i][2]);
+                        Start(false, true);
+                        SetDespawnAtEnd(false);
                     }
                 }
             }
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp
index c049be0309b..07bfdae208f 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp
@@ -52,7 +52,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_epochAI(creature);
+        return GetInstanceAI<boss_epochAI>(creature);
     }
 
     struct boss_epochAI : public ScriptedAI
@@ -81,16 +81,14 @@ public:
             uiTimeStopTimer = 21300;
             uiWoundingStrikeTimer = 5300;
 
-            if (instance)
-                instance->SetData(DATA_EPOCH_EVENT, NOT_STARTED);
+            instance->SetData(DATA_EPOCH_EVENT, NOT_STARTED);
         }
 
         void EnterCombat(Unit* /*who*/) OVERRIDE
         {
             Talk(SAY_AGGRO);
 
-            if (instance)
-                instance->SetData(DATA_EPOCH_EVENT, IN_PROGRESS);
+            instance->SetData(DATA_EPOCH_EVENT, IN_PROGRESS);
         }
 
         void UpdateAI(uint32 diff) OVERRIDE
@@ -132,8 +130,7 @@ public:
         {
             Talk(SAY_DEATH);
 
-            if (instance)
-                instance->SetData(DATA_EPOCH_EVENT, DONE);
+            instance->SetData(DATA_EPOCH_EVENT, DONE);
         }
 
         void KilledUnit(Unit* victim) OVERRIDE
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp
index 54438e3b8a9..f9ea0f482f0 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp
@@ -39,7 +39,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_infinite_corruptorAI(creature);
+        return GetInstanceAI<boss_infinite_corruptorAI>(creature);
     }
 
     struct boss_infinite_corruptorAI : public ScriptedAI
@@ -53,15 +53,13 @@ public:
 
         void Reset() OVERRIDE
         {
-            if (instance)
-                instance->SetData(DATA_INFINITE_EVENT, NOT_STARTED);
+            instance->SetData(DATA_INFINITE_EVENT, NOT_STARTED);
         }
 
         void EnterCombat(Unit* /*who*/) OVERRIDE
         {
             Talk(SAY_AGGRO);
-            if (instance)
-                instance->SetData(DATA_INFINITE_EVENT, IN_PROGRESS);
+            instance->SetData(DATA_INFINITE_EVENT, IN_PROGRESS);
         }
 
         void UpdateAI(uint32 /*diff*/) OVERRIDE
@@ -76,8 +74,7 @@ public:
         void JustDied(Unit* /*killer*/) OVERRIDE
         {
             Talk(SAY_DEATH);
-            if (instance)
-                instance->SetData(DATA_INFINITE_EVENT, DONE);
+            instance->SetData(DATA_INFINITE_EVENT, DONE);
         }
     };
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
index e16ed882171..0e1d6e966c5 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
@@ -66,7 +66,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_mal_ganisAI(creature);
+        return GetInstanceAI<boss_mal_ganisAI>(creature);
     }
 
     struct boss_mal_ganisAI : public ScriptedAI
@@ -102,15 +102,13 @@ public:
              uiSleepTimer = urand(15000, 20000);
              uiOutroTimer = 1000;
 
-             if (instance)
-                 instance->SetData(DATA_MAL_GANIS_EVENT, NOT_STARTED);
+             instance->SetData(DATA_MAL_GANIS_EVENT, NOT_STARTED);
         }
 
         void EnterCombat(Unit* /*who*/) OVERRIDE
         {
             Talk(SAY_AGGRO);
-            if (instance)
-                instance->SetData(DATA_MAL_GANIS_EVENT, IN_PROGRESS);
+            instance->SetData(DATA_MAL_GANIS_EVENT, IN_PROGRESS);
         }
 
         void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE
@@ -154,8 +152,7 @@ public:
                         {
                             EnterEvadeMode();
                             me->DisappearAndDie();
-                            if (instance)
-                                instance->SetData(DATA_MAL_GANIS_EVENT, FAIL);
+                            instance->SetData(DATA_MAL_GANIS_EVENT, FAIL);
                         }
 
                     if (uiCarrionSwarmTimer < diff)
@@ -228,13 +225,10 @@ public:
 
         void JustDied(Unit* /*killer*/) OVERRIDE
         {
-            if (instance)
-            {
-                instance->SetData(DATA_MAL_GANIS_EVENT, DONE);
-                DoCastAOE(SPELL_MAL_GANIS_KILL_CREDIT);
-                // give achievement credit and LFG rewards to players. criteria use spell 58630 which doesn't exist, but it was created in spell_dbc
-                DoCastAOE(SPELL_KILL_CREDIT);
-            }
+            instance->SetData(DATA_MAL_GANIS_EVENT, DONE);
+            DoCastAOE(SPELL_MAL_GANIS_KILL_CREDIT);
+            // give achievement credit and LFG rewards to players. criteria use spell 58630 which doesn't exist, but it was created in spell_dbc
+            DoCastAOE(SPELL_KILL_CREDIT);
         }
 
         void KilledUnit(Unit* victim) OVERRIDE
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
index aff076f4763..5b8ba2ad18c 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
@@ -51,7 +51,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_meathookAI(creature);
+        return GetInstanceAI<boss_meathookAI>(creature);
     }
 
     struct boss_meathookAI : public ScriptedAI
@@ -59,8 +59,7 @@ public:
         boss_meathookAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
-            if (instance)
-                Talk(SAY_SPAWN);
+            Talk(SAY_SPAWN);
         }
 
         uint32 uiChainTimer;
@@ -75,16 +74,14 @@ public:
             uiDiseaseTimer = urand(2000, 4000);   //approx 3s
             uiFrenzyTimer = urand(21000, 26000);  //made it up
 
-            if (instance)
-                instance->SetData(DATA_MEATHOOK_EVENT, NOT_STARTED);
+            instance->SetData(DATA_MEATHOOK_EVENT, NOT_STARTED);
         }
 
         void EnterCombat(Unit* /*who*/) OVERRIDE
         {
             Talk(SAY_AGGRO);
 
-            if (instance)
-                instance->SetData(DATA_MEATHOOK_EVENT, IN_PROGRESS);
+            instance->SetData(DATA_MEATHOOK_EVENT, IN_PROGRESS);
         }
 
         void UpdateAI(uint32 diff) OVERRIDE
@@ -119,8 +116,7 @@ public:
         {
             Talk(SAY_DEATH);
 
-            if (instance)
-                instance->SetData(DATA_MEATHOOK_EVENT, DONE);
+            instance->SetData(DATA_MEATHOOK_EVENT, DONE);
         }
 
         void KilledUnit(Unit* victim) OVERRIDE
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
index fc5b3c4a8b0..0716f71574c 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
@@ -56,7 +56,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_salrammAI(creature);
+        return GetInstanceAI<boss_salrammAI>(creature);
     }
 
     struct boss_salrammAI : public ScriptedAI
@@ -64,8 +64,7 @@ public:
         boss_salrammAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
-            if (instance)
-                Talk(SAY_SPAWN);
+            Talk(SAY_SPAWN);
         }
 
         uint32 uiCurseFleshTimer;
@@ -84,16 +83,14 @@ public:
              uiStealFleshTimer = 12345;
              uiSummonGhoulsTimer = urand(19000, 24000); //on a video approx 24s after aggro
 
-             if (instance)
-                 instance->SetData(DATA_SALRAMM_EVENT, NOT_STARTED);
+             instance->SetData(DATA_SALRAMM_EVENT, NOT_STARTED);
         }
 
         void EnterCombat(Unit* /*who*/) OVERRIDE
         {
             Talk(SAY_AGGRO);
 
-            if (instance)
-                 instance->SetData(DATA_SALRAMM_EVENT, IN_PROGRESS);
+            instance->SetData(DATA_SALRAMM_EVENT, IN_PROGRESS);
         }
 
         void UpdateAI(uint32 diff) OVERRIDE
@@ -142,8 +139,7 @@ public:
         {
             Talk(SAY_DEATH);
 
-            if (instance)
-                instance->SetData(DATA_SALRAMM_EVENT, DONE);
+            instance->SetData(DATA_SALRAMM_EVENT, DONE);
         }
 
         void KilledUnit(Unit* victim) OVERRIDE
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
index dbead663cff..e8f776d8a75 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
@@ -344,7 +344,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_arthasAI(creature);
+        return GetInstanceAI<npc_arthasAI>(creature);
     }
 
     struct npc_arthasAI : public npc_escortAI
@@ -399,22 +399,20 @@ public:
             malganisGUID = 0;
             infiniteGUID = 0;
 
-            if (instance) {
-                instance->SetData(DATA_ARTHAS_EVENT, NOT_STARTED);
-                switch (instance->GetData(DATA_ARTHAS_EVENT))
-                {
-                    case NOT_STARTED:
-                        bStepping = true;
-                        step = 0;
-                        me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
-                        bossEvent = DATA_MEATHOOK_EVENT;
-                        gossipStep = 0;
-                        break;
-                }
-                phaseTimer = 1000;
-                exorcismTimer = 7300;
-                wave = 0;
+            instance->SetData(DATA_ARTHAS_EVENT, NOT_STARTED);
+            switch (instance->GetData(DATA_ARTHAS_EVENT))
+            {
+                case NOT_STARTED:
+                    bStepping = true;
+                    step = 0;
+                    me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                    bossEvent = DATA_MEATHOOK_EVENT;
+                    gossipStep = 0;
+                    break;
             }
+            phaseTimer = 1000;
+            exorcismTimer = 7300;
+            wave = 0;
         }
 
         void EnterCombat(Unit* /*who*/) OVERRIDE
@@ -424,8 +422,7 @@ public:
 
         void JustDied(Unit* /*killer*/) OVERRIDE
         {
-            if (instance)
-                instance->SetData(DATA_ARTHAS_EVENT, FAIL);
+            instance->SetData(DATA_ARTHAS_EVENT, FAIL);
         }
 
         void SpawnTimeRift(uint32 timeRiftID, uint64* guidVector)
@@ -559,9 +556,8 @@ public:
                     Talk(SAY_PHASE403);
                     break;
                 case 36:
-                    if (instance)
-                        if (GameObject* pGate = instance->instance->GetGameObject(instance->GetData64(DATA_SHKAF_GATE)))
-                            pGate->SetGoState(GO_STATE_ACTIVE);
+                    if (GameObject* pGate = instance->instance->GetGameObject(instance->GetData64(DATA_SHKAF_GATE)))
+                        pGate->SetGoState(GO_STATE_ACTIVE);
                     break;
                 case 45:
                     SetRun(true);
@@ -888,8 +884,7 @@ public:
                             Talk(SAY_PHASE209);
 
                             bossEvent = DATA_MEATHOOK_EVENT;
-                            if (instance)
-                                instance->SetData(DATA_ARTHAS_EVENT, IN_PROGRESS);
+                            instance->SetData(DATA_ARTHAS_EVENT, IN_PROGRESS);
 
                             me->SetReactState(REACT_DEFENSIVE);
                             SetDespawnAtFar(false);
@@ -961,25 +956,22 @@ public:
                             break;
                         case 50: //Wait Boss death
                         case 60:
-                            if (instance)
+                            if (instance->GetData(bossEvent) == DONE)
                             {
-                                if (instance->GetData(bossEvent) == DONE)
+                                JumpToNextStep(1000);
+                                if (bossEvent == DATA_MEATHOOK_EVENT)
+                                    bossEvent = DATA_SALRAMM_EVENT;
+                                else if (bossEvent == DATA_SALRAMM_EVENT)
                                 {
-                                    JumpToNextStep(1000);
-                                    if (bossEvent == DATA_MEATHOOK_EVENT)
-                                        bossEvent = DATA_SALRAMM_EVENT;
-                                    else if (bossEvent == DATA_SALRAMM_EVENT)
-                                    {
-                                        SetHoldState(false);
-                                        bStepping = false;
-                                        bossEvent = DATA_EPOCH_EVENT;
-                                    }
+                                    SetHoldState(false);
+                                    bStepping = false;
+                                    bossEvent = DATA_EPOCH_EVENT;
                                 }
-                                else if (instance->GetData(bossEvent) == FAIL)
-                                    npc_escortAI::EnterEvadeMode();
-                                else
-                                    phaseTimer = 10000;
                             }
+                            else if (instance->GetData(bossEvent) == FAIL)
+                                npc_escortAI::EnterEvadeMode();
+                            else
+                                phaseTimer = 10000;
                             break;
                         //After Gossip 2 (waypoint 22)
                         case 61:
@@ -1096,53 +1088,47 @@ public:
                             JumpToNextStep(1000);
                             break;
                         case 80:
-                            if (instance)
-                                if (instance->GetData(DATA_EPOCH_EVENT) != DONE)
-                                {
-                                    SpawnTimeRift(17, &epochGUID);
-                                    if (Creature* epoch = Unit::GetCreature(*me, epochGUID))
-                                        epoch->AI()->Talk(SAY_PHASE314);
-                                    me->SetTarget(epochGUID);
-                                }
+                            if (instance->GetData(DATA_EPOCH_EVENT) != DONE)
+                            {
+                                SpawnTimeRift(17, &epochGUID);
+                                if (Creature* epoch = Unit::GetCreature(*me, epochGUID))
+                                    epoch->AI()->Talk(SAY_PHASE314);
+                                me->SetTarget(epochGUID);
+                            }
                             JumpToNextStep(18000);
                             break;
                         case 81:
-                            if (instance)
-                                if (instance->GetData(DATA_EPOCH_EVENT) != DONE)
-                                    Talk(SAY_PHASE315);
+                            if (instance->GetData(DATA_EPOCH_EVENT) != DONE)
+                                Talk(SAY_PHASE315);
                             JumpToNextStep(6000);
                             break;
                         case 82:
-                            if (instance)
-                                if (instance->GetData(DATA_EPOCH_EVENT) != DONE)
+                            if (instance->GetData(DATA_EPOCH_EVENT) != DONE)
+                            {
+                                if (Creature* epoch = Unit::GetCreature(*me, epochGUID))
                                 {
-                                    if (Creature* epoch = Unit::GetCreature(*me, epochGUID))
-                                    {
-                                        //Make Epoch attackable
-                                        epoch->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
-                                        epoch->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
-                                        epoch->SetReactState(REACT_AGGRESSIVE);
-                                    }
-
+                                    //Make Epoch attackable
+                                    epoch->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
+                                    epoch->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                                    epoch->SetReactState(REACT_AGGRESSIVE);
                                 }
+
+                            }
                             JumpToNextStep(1000);
                             break;
                         case 83:
-                            if (instance)
+                            if (instance->GetData(DATA_EPOCH_EVENT) == DONE)
                             {
-                                if (instance->GetData(DATA_EPOCH_EVENT) == DONE)
-                                {
-                                    gossipStep = 3;
-                                    me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
-                                    bStepping = false;
-                                    bossEvent = DATA_MAL_GANIS_EVENT;
-                                    JumpToNextStep(15000);
-                                }
-                                else if (instance->GetData(DATA_EPOCH_EVENT) == FAIL)
-                                    npc_escortAI::EnterEvadeMode();
-                                else
-                                    phaseTimer = 10000;
+                                gossipStep = 3;
+                                me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+                                bStepping = false;
+                                bossEvent = DATA_MAL_GANIS_EVENT;
+                                JumpToNextStep(15000);
                             }
+                            else if (instance->GetData(DATA_EPOCH_EVENT) == FAIL)
+                                npc_escortAI::EnterEvadeMode();
+                            else
+                                phaseTimer = 10000;
                             break;
                         //After Gossip 4
                         case 84:
@@ -1158,9 +1144,8 @@ public:
                                 malganisGUID = malganis->GetGUID();
                                 malganis->SetReactState(REACT_PASSIVE);
                             }
-                            if (instance)
-                                if (GameObject* pGate = instance->instance->GetGameObject(instance->GetData64(DATA_MAL_GANIS_GATE_1)))
-                                    pGate->SetGoState(GO_STATE_ACTIVE);
+                            if (GameObject* pGate = instance->instance->GetGameObject(instance->GetData64(DATA_MAL_GANIS_GATE_1)))
+                                pGate->SetGoState(GO_STATE_ACTIVE);
                             SetHoldState(false);
                             bStepping = false;
                             JumpToNextStep(0);
@@ -1180,18 +1165,15 @@ public:
                             JumpToNextStep(1000);
                             break;
                         case 88:
-                            if (instance)
+                            if (instance->GetData(DATA_MAL_GANIS_EVENT) == DONE)
                             {
-                                if (instance->GetData(DATA_MAL_GANIS_EVENT) == DONE)
-                                {
-                                    SetHoldState(false);
-                                    JumpToNextStep(1000);
-                                }
-                                else if (instance->GetData(DATA_MAL_GANIS_EVENT) == FAIL)
-                                    npc_escortAI::EnterEvadeMode();
-                                else
-                                    phaseTimer = 10000;
+                                SetHoldState(false);
+                                JumpToNextStep(1000);
                             }
+                            else if (instance->GetData(DATA_MAL_GANIS_EVENT) == FAIL)
+                                npc_escortAI::EnterEvadeMode();
+                            else
+                                phaseTimer = 10000;
                             break;
                         //After waypoint 56
                         case 89:
@@ -1201,11 +1183,8 @@ public:
                             JumpToNextStep(7000);
                             break;
                         case 90:
-                            if (instance)
-                            {
-                                instance->SetData(DATA_ARTHAS_EVENT, DONE); //Rewards: Achiev & Chest ;D
-                                me->SetTarget(instance->GetData64(DATA_MAL_GANIS_GATE_2)); //Look behind
-                            }
+                            instance->SetData(DATA_ARTHAS_EVENT, DONE); //Rewards: Achiev & Chest ;D
+                            me->SetTarget(instance->GetData64(DATA_MAL_GANIS_GATE_2)); //Look behind
                             Talk(SAY_PHASE504);
                             bStepping = false;
                             break;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
index 3b51f6d0f8f..d69137060e0 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
@@ -54,7 +54,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_captain_skarlocAI(creature);
+        return GetInstanceAI<boss_captain_skarlocAI>(creature);
     }
 
     struct boss_captain_skarlocAI : public ScriptedAI
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
index 3e650bf4fe9..0c20669775c 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
@@ -52,7 +52,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_epoch_hunterAI(creature);
+        return GetInstanceAI<boss_epoch_hunterAI>(creature);
     }
 
     struct boss_epoch_hunterAI : public ScriptedAI
@@ -104,7 +104,7 @@ public:
             //Sand Breath
             if (SandBreath_Timer <= diff)
             {
-                if (me->IsNonMeleeSpellCasted(false))
+                if (me->IsNonMeleeSpellCast(false))
                     me->InterruptNonMeleeSpells(false);
 
                 DoCastVictim(SPELL_SAND_BREATH);
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
index bdf7d71a497..f4da323a746 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
@@ -188,7 +188,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_thrall_old_hillsbradAI(creature);
+        return GetInstanceAI<npc_thrall_old_hillsbradAI>(creature);
     }
 
     bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE
@@ -291,9 +291,6 @@ public:
 
         void WaypointReached(uint32 waypointId) OVERRIDE
         {
-            if (!instance)
-                return;
-
             switch (waypointId)
             {
                 case 8:
@@ -526,8 +523,7 @@ public:
         }
         void JustDied(Unit* slayer) OVERRIDE
         {
-            if (instance)
-                instance->SetData(TYPE_THRALL_EVENT, FAIL);
+            instance->SetData(TYPE_THRALL_EVENT, FAIL);
 
             // Don't do a yell if he kills self (if player goes too far or at the end).
             if (slayer == me)
@@ -573,7 +569,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_tarethaAI(creature);
+        return GetInstanceAI<npc_tarethaAI>(creature);
     }
 
     bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
index c929a1b6a55..850dd3a10d7 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
@@ -90,16 +90,14 @@ public:
         {
             Talk(SAY_DEATH);
 
-             if (instance)
-             {
-                 instance->SetData(TYPE_RIFT, DONE);
-                 instance->SetData(TYPE_MEDIVH, DONE); // FIXME: later should be removed
-             }
+            instance->SetData(TYPE_RIFT, DONE);
+            instance->SetData(TYPE_MEDIVH, DONE); // FIXME: later should be removed
         }
 
-        void KilledUnit(Unit* /*victim*/) OVERRIDE
+        void KilledUnit(Unit* who) OVERRIDE
         {
-            Talk(SAY_SLAY);
+            if (who->GetTypeId() == TYPEID_PLAYER)
+                Talk(SAY_SLAY);
         }
 
         void UpdateAI(uint32 diff) OVERRIDE
@@ -140,7 +138,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_aeonusAI(creature);
+        return GetInstanceAI<boss_aeonusAI>(creature);
     }
 };
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
index fe91f3ab712..8910631dc5d 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
@@ -98,8 +98,7 @@ public:
         {
             Talk(SAY_DEATH);
 
-            if (instance)
-                instance->SetData(TYPE_RIFT, SPECIAL);
+            instance->SetData(TYPE_RIFT, SPECIAL);
         }
 
         void UpdateAI(uint32 diff) OVERRIDE
@@ -145,7 +144,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_chrono_lord_dejaAI(creature);
+        return GetInstanceAI<boss_chrono_lord_dejaAI>(creature);
     }
 };
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
index 4d94edf7339..35ddfc2df3d 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
@@ -81,8 +81,7 @@ public:
         {
             Talk(SAY_DEATH);
 
-            if (instance)
-                instance->SetData(TYPE_RIFT, SPECIAL);
+            instance->SetData(TYPE_RIFT, SPECIAL);
         }
 
         void MoveInLineOfSight(Unit* who) OVERRIDE
@@ -143,7 +142,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_temporusAI(creature);
+        return GetInstanceAI<boss_temporusAI>(creature);
     }
 };
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp
index cc3cf8192dc..90e746367c2 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp
@@ -70,7 +70,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_medivh_bmAI(creature);
+        return GetInstanceAI<npc_medivh_bmAI>(creature);
     }
 
     struct npc_medivh_bmAI : public ScriptedAI
@@ -97,9 +97,6 @@ public:
             Life50 = true;
             Life25 = true;
 
-            if (!instance)
-                return;
-
             if (instance->GetData(TYPE_MEDIVH) == IN_PROGRESS)
                 DoCast(me, SPELL_CHANNEL, true);
             else if (me->HasAura(SPELL_CHANNEL))
@@ -109,11 +106,7 @@ public:
         }
 
         void MoveInLineOfSight(Unit* who) OVERRIDE
-
         {
-            if (!instance)
-                return;
-
             if (who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 10.0f))
             {
                 if (instance->GetData(TYPE_MEDIVH) == IN_PROGRESS || instance->GetData(TYPE_MEDIVH) == DONE)
@@ -175,9 +168,6 @@ public:
 
         void UpdateAI(uint32 diff) OVERRIDE
         {
-            if (!instance)
-                return;
-
             if (SpellCorrupt_Timer)
             {
                 if (SpellCorrupt_Timer <= diff)
@@ -268,7 +258,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_time_riftAI(creature);
+        return GetInstanceAI<npc_time_riftAI>(creature);
     }
 
     struct npc_time_riftAI : public ScriptedAI
@@ -291,9 +281,6 @@ public:
             TimeRiftWave_Timer = 15000;
             mRiftWaveCount = 0;
 
-            if (!instance)
-                return;
-
             mPortalCount = instance->GetData(DATA_PORTAL_COUNT);
 
             if (mPortalCount < 6)
@@ -349,16 +336,13 @@ public:
 
         void UpdateAI(uint32 diff) OVERRIDE
         {
-            if (!instance)
-                return;
-
             if (TimeRiftWave_Timer <= diff)
             {
                 DoSelectSummon();
                 TimeRiftWave_Timer = 15000;
             } else TimeRiftWave_Timer -= diff;
 
-            if (me->IsNonMeleeSpellCasted(false))
+            if (me->IsNonMeleeSpellCast(false))
                 return;
 
             TC_LOG_DEBUG("scripts", "npc_time_rift: not casting anylonger, i need to die.");
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
index 79421ffe37e..aef232ab3f3 100644
--- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
@@ -145,12 +145,9 @@ public:
             SummonWhelpCount = 0;
             IsMoving = false;
 
-            if (instance)
-            {
-                instance->SetBossState(DATA_ONYXIA, NOT_STARTED);
-                instance->SetData(DATA_ONYXIA_PHASE, Phase);
-                instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT,  ACHIEV_TIMED_START_EVENT);
-            }
+            instance->SetBossState(DATA_ONYXIA, NOT_STARTED);
+            instance->SetData(DATA_ONYXIA_PHASE, Phase);
+            instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT,  ACHIEV_TIMED_START_EVENT);
         }
 
         void EnterCombat(Unit* /*who*/) OVERRIDE
@@ -163,17 +160,13 @@ public:
             events.ScheduleEvent(EVENT_CLEAVE, urand (2000, 5000));
             events.ScheduleEvent(EVENT_WING_BUFFET, urand (10000, 20000));
 
-            if (instance)
-            {
-                instance->SetBossState(DATA_ONYXIA, IN_PROGRESS);
-                instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT,  ACHIEV_TIMED_START_EVENT);
-            }
+            instance->SetBossState(DATA_ONYXIA, IN_PROGRESS);
+            instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT,  ACHIEV_TIMED_START_EVENT);
         }
 
         void JustDied(Unit* /*killer*/) OVERRIDE
         {
-            if (instance)
-                instance->SetBossState(DATA_ONYXIA, DONE);
+            instance->SetBossState(DATA_ONYXIA, DONE);
 
             Summons.DespawnAll();
         }
@@ -246,8 +239,7 @@ public:
                         me->GetMotionMaster()->MovePoint(11, Phase2Location.GetPositionX(), Phase2Location.GetPositionY(), Phase2Location.GetPositionZ()+25);
                         me->SetSpeed(MOVE_FLIGHT, 1.0f);
                         Talk(SAY_PHASE_2_TRANS);
-                        if (instance)
-                            instance->SetData(DATA_ONYXIA_PHASE, Phase);
+                        instance->SetData(DATA_ONYXIA_PHASE, Phase);
                         events.ScheduleEvent(EVENT_WHELP_SPAWN, 5000);
                         events.ScheduleEvent(EVENT_LAIR_GUARD, 15000);
                         break;
@@ -280,10 +272,7 @@ public:
                 (Spell->Id >= 22267 && Spell->Id <= 22268)) &&
                 (target->GetTypeId() == TYPEID_PLAYER))
             {
-                if (instance)
-                {
                     instance->SetData(DATA_SHE_DEEP_BREATH_MORE, FAIL);
-                }
             }
         }
 
@@ -383,8 +372,7 @@ public:
                 if (HealthBelowPct(40))
                 {
                     Phase = PHASE_END;
-                    if (instance)
-                        instance->SetData(DATA_ONYXIA_PHASE, PHASE_END);
+                    instance->SetData(DATA_ONYXIA_PHASE, PHASE_END);
                     Talk(SAY_PHASE_3_TRANS);
 
                     SetCombatMovement(true);
@@ -404,7 +392,7 @@ public:
                         case EVENT_DEEP_BREATH:      // Phase PHASE_BREATH
                             if (!IsMoving)
                             {
-                                if (me->IsNonMeleeSpellCasted(false))
+                                if (me->IsNonMeleeSpellCast(false))
                                     me->InterruptNonMeleeSpells(false);
 
                                 Talk(EMOTE_BREATH);
@@ -469,7 +457,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_onyxiaAI(creature);
+        return GetInstanceAI<boss_onyxiaAI>(creature);
     }
 };
 
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
index 323fd92a8f6..952ed5679f9 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
@@ -69,9 +69,10 @@ public:
             Talk(SAY_AGGRO);
         }
 
-        void KilledUnit(Unit* /*victim*/) OVERRIDE
+        void KilledUnit(Unit* who) OVERRIDE
         {
-            Talk(SAY_KILL);
+            if (who->GetTypeId() == TYPEID_PLAYER)
+                Talk(SAY_KILL);
         }
 
         void JustDied(Unit* /*killer*/) OVERRIDE
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
index abd76ebe508..6c4db288a0f 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
@@ -321,7 +321,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_belnistraszAI(creature);
+        return GetInstanceAI<npc_belnistraszAI>(creature);
     }
 };
 
@@ -341,9 +341,6 @@ public:
 
         void SetData(uint32 /*type*/, uint32 data) OVERRIDE
         {
-            if (!instance)
-                return;
-
             if (data < 7)
             {
                 me->SummonCreature(NPC_WITHERED_BATTLE_BOAR, me->GetPositionX(),  me->GetPositionY(),  me->GetPositionZ(),  me->GetOrientation());
@@ -362,7 +359,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_idol_room_spawnerAI(creature);
+        return GetInstanceAI<npc_idol_room_spawnerAI>(creature);
     }
 };
 
@@ -397,8 +394,7 @@ public:
 
         void JustDied(Unit* /*killer*/) OVERRIDE
         {
-            if (instance)
-                instance->SetData(DATA_WAVE, me->GetEntry());
+            instance->SetData(DATA_WAVE, me->GetEntry());
         }
 
         void EnterCombat(Unit* /*who*/) OVERRIDE
@@ -433,7 +429,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_tomb_creatureAI(creature);
+        return GetInstanceAI<npc_tomb_creatureAI>(creature);
     }
 };
 
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
index 327fe0d1358..1cdcfae1139 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
@@ -232,7 +232,7 @@ class boss_ayamiss : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const OVERRIDE
         {
-            return new boss_ayamissAI(creature);
+            return GetInstanceAI<boss_ayamissAI>(creature);
         }
 };
 
@@ -286,7 +286,7 @@ class npc_hive_zara_larva : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const OVERRIDE
         {
-            return new npc_hive_zara_larvaAI(creature);
+            return GetInstanceAI<npc_hive_zara_larvaAI>(creature);
         }
 };
 
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
index 0890a9804f9..ae4b42a4221 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
@@ -236,7 +236,7 @@ class npc_buru_egg : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const OVERRIDE
         {
-            return new npc_buru_eggAI(creature);
+            return GetInstanceAI<npc_buru_eggAI>(creature);
         }
 };
 
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
index 0b58ded0b1c..09c4734dc49 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
@@ -127,7 +127,7 @@ class boss_kurinnaxx : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const OVERRIDE
         {
-            return new boss_kurinnaxxAI(creature);
+            return GetInstanceAI<boss_kurinnaxxAI>(creature);
         }
 };
 
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
index 366f74f469e..06d193ee5b0 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
@@ -136,26 +136,23 @@ class boss_ossirian : public CreatureScript
                 DoCast(me, SPELL_SUPREME);
                 Talk(SAY_AGGRO);
 
-                if (instance)
-                {
-                    Map* map = me->GetMap();
-                    if (!map->IsDungeon())
-                        return;
+                Map* map = me->GetMap();
+                if (!map->IsDungeon())
+                    return;
 
-                    WorldPacket data(SMSG_WEATHER, (4+4+4));
-                    data << uint32(WEATHER_STATE_HEAVY_SANDSTORM) << float(1) << uint8(0);
-                    map->SendToPlayers(&data);
+                WorldPacket data(SMSG_WEATHER, (4+4+4));
+                data << uint32(WEATHER_STATE_HEAVY_SANDSTORM) << float(1) << uint8(0);
+                map->SendToPlayers(&data);
 
-                    for (uint8 i = 0; i < NUM_TORNADOS; ++i)
-                    {
-                        Position Point;
-                        me->GetRandomPoint(RoomCenter, RoomRadius, Point);
-                        if (Creature* Tornado = me->GetMap()->SummonCreature(NPC_SAND_VORTEX, Point))
-                            Tornado->CastSpell(Tornado, SPELL_SAND_STORM, true);
-                    }
-
-                    SpawnNextCrystal();
+                for (uint8 i = 0; i < NUM_TORNADOS; ++i)
+                {
+                    Position Point;
+                    me->GetRandomPoint(RoomCenter, RoomRadius, Point);
+                    if (Creature* Tornado = me->GetMap()->SummonCreature(NPC_SAND_VORTEX, Point))
+                        Tornado->CastSpell(Tornado, SPELL_SAND_STORM, true);
                 }
+
+                SpawnNextCrystal();
             }
 
             void KilledUnit(Unit* /*victim*/) OVERRIDE
@@ -273,7 +270,7 @@ class boss_ossirian : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const OVERRIDE
         {
-            return new boss_ossirianAI(creature);
+            return GetInstanceAI<boss_ossirianAI>(creature);
         }
 };
 
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
index 8dd009cdb32..5f0481431a8 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
@@ -32,7 +32,7 @@ enum Spells
     SPELL_CLEAVE       = 26350,
     SPELL_TOXIC_VOLLEY = 25812,
     SPELL_POISON_CLOUD = 38718, //Only Spell with right dmg.
-    SPELL_ENRAGE       = 34624, //Changed cause 25790 is casted on gamers too. Same prob with old explosion of twin emperors.
+    SPELL_ENRAGE       = 34624, //Changed cause 25790 is cast on gamers too. Same prob with old explosion of twin emperors.
 
     SPELL_CHARGE       = 26561,
     SPELL_KNOCKBACK    = 26027,
@@ -48,7 +48,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_kriAI(creature);
+        return GetInstanceAI<boss_kriAI>(creature);
     }
 
     struct boss_kriAI : public ScriptedAI
@@ -83,14 +83,10 @@ public:
 
         void JustDied(Unit* /*killer*/) OVERRIDE
         {
-            if (instance)
-            {
-                if (instance->GetData(DATA_BUG_TRIO_DEATH) < 2)
-                                                                // Unlootable if death
-                    me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
+            if (instance->GetData(DATA_BUG_TRIO_DEATH) < 2)// Unlootable if death
+                me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
 
-                instance->SetData(DATA_BUG_TRIO_DEATH, 1);
-            }
+            instance->SetData(DATA_BUG_TRIO_DEATH, 1);
         }
         void UpdateAI(uint32 diff) OVERRIDE
         {
@@ -145,7 +141,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_vemAI(creature);
+        return GetInstanceAI<boss_vemAI>(creature);
     }
 
     struct boss_vemAI : public ScriptedAI
@@ -174,14 +170,10 @@ public:
 
         void JustDied(Unit* /*killer*/) OVERRIDE
         {
-            if (instance)
-            {
-                instance->SetData(DATA_VEM_DEATH, 0);
-                if (instance->GetData(DATA_BUG_TRIO_DEATH) < 2)
-                                                                // Unlootable if death
-                    me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
-                instance->SetData(DATA_BUG_TRIO_DEATH, 1);
-            }
+            instance->SetData(DATA_VEM_DEATH, 0);
+            if (instance->GetData(DATA_BUG_TRIO_DEATH) < 2)// Unlootable if death
+                me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
+            instance->SetData(DATA_BUG_TRIO_DEATH, 1);
         }
 
         void EnterCombat(Unit* /*who*/) OVERRIDE
@@ -238,7 +230,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_yaujAI(creature);
+        return GetInstanceAI<boss_yaujAI>(creature);
     }
 
     struct boss_yaujAI : public ScriptedAI
@@ -267,13 +259,9 @@ public:
 
         void JustDied(Unit* /*killer*/) OVERRIDE
         {
-            if (instance)
-            {
-                if (instance->GetData(DATA_BUG_TRIO_DEATH) < 2)
-                                                                // Unlootable if death
-                    me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
-                instance->SetData(DATA_BUG_TRIO_DEATH, 1);
-            }
+            if (instance->GetData(DATA_BUG_TRIO_DEATH) < 2)// Unlootable if death
+                me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
+            instance->SetData(DATA_BUG_TRIO_DEATH, 1);
 
             for (uint8 i = 0; i < 10; ++i)
             {
@@ -306,22 +294,19 @@ public:
             //Casting Heal to other twins or herself.
             if (Heal_Timer <= diff)
             {
-                if (instance)
+                switch (urand(0, 2))
                 {
-                    switch (urand(0, 2))
-                    {
-                        case 0:
-                            if (Creature* kri = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_KRI)))
-                                DoCast(kri, SPELL_HEAL);
-                            break;
-                        case 1:
-                            if (Creature* vem = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_VEM)))
-                                DoCast(vem, SPELL_HEAL);
-                            break;
-                        case 2:
-                            DoCast(me, SPELL_HEAL);
-                            break;
-                    }
+                    case 0:
+                        if (Creature* kri = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_KRI)))
+                            DoCast(kri, SPELL_HEAL);
+                        break;
+                    case 1:
+                        if (Creature* vem = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_VEM)))
+                            DoCast(vem, SPELL_HEAL);
+                        break;
+                    case 2:
+                        DoCast(me, SPELL_HEAL);
+                        break;
                 }
 
                 Heal_Timer = 15000+rand()%15000;
@@ -332,13 +317,10 @@ public:
             {
                 if (!VemDead)
                 {
-                    if (instance)
+                    if (instance->GetData(DATA_VEMISDEAD))
                     {
-                        if (instance->GetData(DATA_VEMISDEAD))
-                        {
-                            DoCast(me, SPELL_ENRAGE);
-                            VemDead = true;
-                        }
+                        DoCast(me, SPELL_ENRAGE);
+                        VemDead = true;
                     }
                 }
                 Check_Timer = 2000;
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
index d2b5b5eaf8c..67b093a2c38 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
@@ -153,7 +153,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new eye_of_cthunAI(creature);
+        return GetInstanceAI<eye_of_cthunAI>(creature);
     }
 
     struct eye_of_cthunAI : public ScriptedAI
@@ -161,8 +161,6 @@ public:
         eye_of_cthunAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
-            if (!instance)
-                TC_LOG_ERROR("scripts", "No Instance eye_of_cthunAI");
 
             SetCombatMovement(false);
         }
@@ -206,8 +204,7 @@ public:
             me->SetVisible(true);
 
             //Reset Phase
-            if (instance)
-                instance->SetData(DATA_CTHUN_PHASE, PHASE_NOT_STARTED);
+            instance->SetData(DATA_CTHUN_PHASE, PHASE_NOT_STARTED);
 
             //to avoid having a following void zone
             Creature* pPortal= me->FindNearestCreature(NPC_CTHUN_PORTAL, 10);
@@ -218,8 +215,7 @@ public:
         void EnterCombat(Unit* /*who*/) OVERRIDE
         {
             DoZoneInCombat();
-            if (instance)
-                instance->SetData(DATA_CTHUN_PHASE, PHASE_EYE_GREEN_BEAM);
+            instance->SetData(DATA_CTHUN_PHASE, PHASE_EYE_GREEN_BEAM);
         }
 
         void SpawnEyeTentacle(float x, float y)
@@ -236,10 +232,6 @@ public:
             if (!UpdateVictim())
                 return;
 
-            //No instance
-            if (!instance)
-                return;
-
             uint32 currentPhase = instance->GetData(DATA_CTHUN_PHASE);
             if (currentPhase == PHASE_EYE_GREEN_BEAM || currentPhase == PHASE_EYE_RED_BEAM)
             {
@@ -404,10 +396,6 @@ public:
 
         void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE
         {
-            //No instance
-            if (!instance)
-                return;
-
             switch (instance->GetData(DATA_CTHUN_PHASE))
             {
                 case PHASE_EYE_GREEN_BEAM:
@@ -459,7 +447,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new cthunAI(creature);
+        return GetInstanceAI<cthunAI>(creature);
     }
 
     struct cthunAI : public ScriptedAI
@@ -469,8 +457,6 @@ public:
             SetCombatMovement(false);
 
             instance = creature->GetInstanceScript();
-            if (!instance)
-                TC_LOG_ERROR("scripts", "No Instance eye_of_cthunAI");
         }
 
         InstanceScript* instance;
@@ -528,8 +514,7 @@ public:
             me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE);
             me->SetVisible(false);
 
-            if (instance)
-                instance->SetData(DATA_CTHUN_PHASE, PHASE_NOT_STARTED);
+            instance->SetData(DATA_CTHUN_PHASE, PHASE_NOT_STARTED);
         }
 
         void EnterCombat(Unit* /*who*/) OVERRIDE
@@ -615,10 +600,6 @@ public:
 
             me->SetTarget(0);
 
-            //No instance
-            if (!instance)
-                return;
-
             uint32 currentPhase = instance->GetData(DATA_CTHUN_PHASE);
             if (currentPhase == PHASE_CTHUN_STOMACH || currentPhase == PHASE_CTHUN_WEAK)
             {
@@ -861,16 +842,11 @@ public:
 
         void JustDied(Unit* /*killer*/) OVERRIDE
         {
-            if (instance)
-                instance->SetData(DATA_CTHUN_PHASE, PHASE_CTHUN_DONE);
+            instance->SetData(DATA_CTHUN_PHASE, PHASE_CTHUN_DONE);
         }
 
         void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE
         {
-            //No instance
-            if (!instance)
-                return;
-
             switch (instance->GetData(DATA_CTHUN_PHASE))
             {
                 case PHASE_CTHUN_STOMACH:
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
index a3edd9ad83d..f640173efb2 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
@@ -160,7 +160,7 @@ public:
                 //If she is 20% enrage
                 if (!Enraged)
                 {
-                    if (!HealthAbovePct(20) && !me->IsNonMeleeSpellCasted(false))
+                    if (!HealthAbovePct(20) && !me->IsNonMeleeSpellCast(false))
                     {
                         DoCast(me, SPELL_ENRAGE);
                         Enraged = true;
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
index 1d888f3ce8b..90207746838 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
@@ -80,7 +80,7 @@ struct boss_twinemperorsAI : public ScriptedAI
     uint32 AfterTeleportTimer;
     bool DontYellWhenDead;
     uint32 Abuse_Bug_Timer, BugsTimer;
-    bool tspellcasted;
+    bool tspellcast;
     uint32 EnrageTimer;
 
     virtual bool IAmVeklor() = 0;
@@ -92,7 +92,7 @@ struct boss_twinemperorsAI : public ScriptedAI
         Heal_Timer = 0;                                     // first heal immediately when they get close together
         Teleport_Timer = TELEPORTTIME;
         AfterTeleport = false;
-        tspellcasted = false;
+        tspellcast = false;
         AfterTeleportTimer = 0;
         Abuse_Bug_Timer = urand(10000, 17000);
         BugsTimer = 2000;
@@ -103,10 +103,7 @@ struct boss_twinemperorsAI : public ScriptedAI
 
     Creature* GetOtherBoss()
     {
-        if (instance)
-            return Unit::GetCreature(*me, instance->GetData64(IAmVeklor() ? DATA_VEKNILASH : DATA_VEKLOR));
-        else
-            return NULL;
+        return Unit::GetCreature(*me, instance->GetData64(IAmVeklor() ? DATA_VEKNILASH : DATA_VEKLOR));
     }
 
     void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE
@@ -210,9 +207,6 @@ struct boss_twinemperorsAI : public ScriptedAI
 
     void TeleportToMyBrother()
     {
-        if (!instance)
-            return;
-
         Teleport_Timer = TELEPORTTIME;
 
         if (IAmVeklor())
@@ -243,21 +237,21 @@ struct boss_twinemperorsAI : public ScriptedAI
         me->AddUnitState(UNIT_STATE_STUNNED);
         AfterTeleport = true;
         AfterTeleportTimer = 2000;
-        tspellcasted = false;
+        tspellcast = false;
     }
 
     bool TryActivateAfterTTelep(uint32 diff)
     {
         if (AfterTeleport)
         {
-            if (!tspellcasted)
+            if (!tspellcast)
             {
                 me->ClearUnitState(UNIT_STATE_STUNNED);
                 DoCast(me, SPELL_TWIN_TELEPORT);
                 me->AddUnitState(UNIT_STATE_STUNNED);
             }
 
-            tspellcasted = true;
+            tspellcast = true;
 
             if (AfterTeleportTimer <= diff)
             {
@@ -378,7 +372,7 @@ struct boss_twinemperorsAI : public ScriptedAI
     {
         if (EnrageTimer <= diff)
         {
-            if (!me->IsNonMeleeSpellCasted(true))
+            if (!me->IsNonMeleeSpellCast(true))
             {
                 DoCast(me, SPELL_BERSERK);
                 EnrageTimer = 60*60000;
@@ -394,7 +388,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_veknilashAI(creature);
+        return GetInstanceAI<boss_veknilashAI>(creature);
     }
 
     struct boss_veknilashAI : public boss_twinemperorsAI
@@ -480,7 +474,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_veklorAI(creature);
+        return GetInstanceAI<boss_veklorAI>(creature);
     }
 
     struct boss_veklorAI : public boss_twinemperorsAI
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
index 115d9d0d12c..18dcc718848 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
@@ -263,8 +263,6 @@ class npc_glob_of_viscidus : public CreatureScript
             void JustDied(Unit* /*killer*/) OVERRIDE
             {
                 InstanceScript* Instance = me->GetInstanceScript();
-                if (!Instance)
-                    return;
 
                 if (Creature* Viscidus = me->GetMap()->GetCreature(Instance->GetData64(DATA_VISCIDUS)))
                 {
@@ -289,14 +287,15 @@ class npc_glob_of_viscidus : public CreatureScript
                 if (id == ROOM_CENTER)
                 {
                     DoCast(me, SPELL_REJOIN_VISCIDUS);
-                    ((TempSummon*)me)->UnSummon();
+                    if (TempSummon* summon = me->ToTempSummon())
+                        summon->UnSummon();
                 }
             }
         };
 
         CreatureAI* GetAI(Creature* creature) const OVERRIDE
         {
-            return new npc_glob_of_viscidusAI(creature);
+            return GetInstanceAI<npc_glob_of_viscidusAI>(creature);
         }
 };
 
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp
index a985f353976..9d4a6f54c31 100644
--- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp
+++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp
@@ -81,7 +81,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_disciple_of_naralexAI(creature);
+        return GetInstanceAI<npc_disciple_of_naralexAI>(creature);
     }
 
     bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE
@@ -152,9 +152,6 @@ public:
 
         void WaypointReached(uint32 waypointId) OVERRIDE
         {
-            if (!instance)
-                return;
-
             switch (waypointId)
             {
                 case 4:
@@ -194,13 +191,10 @@ public:
 
         void JustDied(Unit* /*slayer*/) OVERRIDE
         {
-            if (instance)
-            {
-                instance->SetData(TYPE_NARALEX_EVENT, FAIL);
-                instance->SetData(TYPE_NARALEX_PART1, FAIL);
-                instance->SetData(TYPE_NARALEX_PART2, FAIL);
-                instance->SetData(TYPE_NARALEX_PART3, FAIL);
-            }
+            instance->SetData(TYPE_NARALEX_EVENT, FAIL);
+            instance->SetData(TYPE_NARALEX_PART1, FAIL);
+            instance->SetData(TYPE_NARALEX_PART2, FAIL);
+            instance->SetData(TYPE_NARALEX_PART3, FAIL);
         }
 
         void JustSummoned(Creature* summoned) OVERRIDE
@@ -213,8 +207,6 @@ public:
             if (currentEvent != TYPE_NARALEX_PART3)
                 npc_escortAI::UpdateAI(diff);
 
-            if (!instance)
-                return;
             if (eventTimer <= diff)
             {
                 eventTimer = 0;
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp b/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp
index bc31fd118be..23cf3f56c35 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp
@@ -78,8 +78,7 @@ public:
 
         void JustDied(Unit* /*killer*/) OVERRIDE
         {
-            if (instance)
-                instance->SetData(DATA_ZUM_RAH, DONE);
+            instance->SetData(DATA_ZUM_RAH, DONE);
         }
 
         void KilledUnit(Unit* /*victim*/) OVERRIDE
@@ -150,7 +149,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_zum_rahAI(creature);
+        return GetInstanceAI<boss_zum_rahAI>(creature);
     }
 };
 
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
index a2f98b21589..2fe443fd0a3 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
@@ -97,7 +97,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_sergeant_blyAI(creature);
+        return GetInstanceAI<npc_sergeant_blyAI>(creature);
     }
 
     struct npc_sergeant_blyAI : public ScriptedAI
@@ -148,12 +148,9 @@ public:
                             if (Player* target = ObjectAccessor::GetPlayer(*me, PlayerGUID))
                                 AttackStart(target);
 
-                            if (instance)
-                            {
-                                switchFactionIfAlive(instance, ENTRY_RAVEN);
-                                switchFactionIfAlive(instance, ENTRY_ORO);
-                                switchFactionIfAlive(instance, ENTRY_MURTA);
-                            }
+                            switchFactionIfAlive(instance, ENTRY_RAVEN);
+                            switchFactionIfAlive(instance, ENTRY_ORO);
+                            switchFactionIfAlive(instance, ENTRY_MURTA);
                     }
                     postGossipStep++;
                 }
@@ -296,7 +293,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_weegli_blastfuseAI(creature);
+        return GetInstanceAI<npc_weegli_blastfuseAI>(creature);
     }
 
     struct npc_weegli_blastfuseAI : public ScriptedAI
@@ -316,8 +313,7 @@ public:
 
         void Reset() OVERRIDE
         {
-            /*if (instance)
-                instance->SetData(0, NOT_STARTED);*/
+            /*instance->SetData(0, NOT_STARTED);*/
         }
 
         void AttackStart(Unit* victim) OVERRIDE
@@ -327,8 +323,7 @@ public:
 
         void JustDied(Unit* /*killer*/) OVERRIDE
         {
-            /*if (instance)
-                instance->SetData(0, DONE);*/
+            /*instance->SetData(0, DONE);*/
         }
 
         void UpdateAI(uint32 diff) OVERRIDE
@@ -358,22 +353,19 @@ public:
 
         void MovementInform(uint32 /*type*/, uint32 /*id*/) OVERRIDE
         {
-            if (instance)
+            if (instance->GetData(EVENT_PYRAMID) == PYRAMID_CAGES_OPEN)
             {
-                if (instance->GetData(EVENT_PYRAMID) == PYRAMID_CAGES_OPEN)
-                {
-                    instance->SetData(EVENT_PYRAMID, PYRAMID_ARRIVED_AT_STAIR);
-                    Talk(SAY_WEEGLI_OHNO);
-                    me->SetHomePosition(1882.69f, 1272.28f, 41.87f, 0);
-                }
-                else
-                    if (destroyingDoor)
-                    {
-                        instance->DoUseDoorOrButton(instance->GetData64(GO_END_DOOR));
-                        /// @todo leave the area...
-                        me->DespawnOrUnsummon();
-                    };
+                instance->SetData(EVENT_PYRAMID, PYRAMID_ARRIVED_AT_STAIR);
+                Talk(SAY_WEEGLI_OHNO);
+                me->SetHomePosition(1882.69f, 1272.28f, 41.87f, 0);
             }
+            else
+                if (destroyingDoor)
+                {
+                    instance->DoUseDoorOrButton(instance->GetData64(GO_END_DOOR));
+                    /// @todo leave the area...
+                    me->DespawnOrUnsummon();
+                };
         }
 
         void DoAction(int32 /*param*/) OVERRIDE
diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp
index b4aeced5e9b..8304f5ba9e4 100644
--- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp
+++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp
@@ -37,133 +37,118 @@ EndContentData */
 # npc_torek
 ####*/
 
-enum TorekSays
+enum Torek
 {
     SAY_READY                  = 0,
     SAY_MOVE                   = 1,
     SAY_PREPARE                = 2,
     SAY_WIN                    = 3,
     SAY_END                    = 4,
+    SPELL_REND                 = 11977,
+    SPELL_THUNDERCLAP          = 8078,
+    QUEST_TOREK_ASSULT         = 6544,
+    NPC_SPLINTERTREE_RAIDER    = 12859,
+    NPC_DURIEL                 = 12860,
+    NPC_SILVERWING_SENTINEL    = 12896,
+    NPC_SILVERWING_WARRIOR     = 12897,
+    FACTION_QUEST              = 113
 };
 
-enum TorekSpells
+class npc_torek : public CreatureScript
 {
-    SPELL_REND                  = 11977,
-    SPELL_THUNDERCLAP           = 8078,
-};
+public:
+    npc_torek() : CreatureScript("npc_torek") { }
 
-enum TorekMisc
-{
-    QUEST_TOREK_ASSULT          = 6544,
+    struct npc_torekAI : public npc_escortAI
+    {
+        npc_torekAI(Creature* creature) : npc_escortAI(creature) { }
 
-    ENTRY_SPLINTERTREE_RAIDER   = 12859,
-    ENTRY_DURIEL                = 12860,
-    ENTRY_SILVERWING_SENTINEL   = 12896,
-    ENTRY_SILVERWING_WARRIOR    = 12897,
-};
+        void Reset() OVERRIDE
+        {
+            rend_Timer        = 5000;
+            thunderclap_Timer = 8000;
+            _completed        = false;
+        }
 
-class npc_torek : public CreatureScript
-{
-    public:
+        void EnterCombat(Unit* /*who*/) OVERRIDE { }
 
-        npc_torek() : CreatureScript("npc_torek")
+        void JustSummoned(Creature* summoned) OVERRIDE
         {
+            summoned->AI()->AttackStart(me);
         }
 
-        struct npc_torekAI : public npc_escortAI
+        void sQuestAccept(Player* player, Quest const* quest)
         {
-            npc_torekAI(Creature* creature) : npc_escortAI(creature) { }
-
-            uint32 Rend_Timer;
-            uint32 Thunderclap_Timer;
-            bool Completed;
+            if (quest->GetQuestId() == QUEST_TOREK_ASSULT)
+            {
+                /// @todo find companions, make them follow Torek, at any time (possibly done by core/database in future?)
+                Talk(SAY_READY, player);
+                me->setFaction(FACTION_QUEST);
+                npc_escortAI::Start(true, true, player->GetGUID());
+            }
+        }
 
-            void WaypointReached(uint32 waypointId) OVERRIDE
+        void WaypointReached(uint32 waypointId) OVERRIDE
+        {
+            if (Player* player = GetPlayerForEscort())
             {
-                if (Player* player = GetPlayerForEscort())
+                switch (waypointId)
                 {
-                    switch (waypointId)
-                    {
-                        case 1:
-                            Talk(SAY_MOVE, player);
-                            break;
-                        case 8:
-                            Talk(SAY_PREPARE, player);
-                            break;
-                        case 19:
-                            /// @todo verify location and creatures amount.
-                            me->SummonCreature(ENTRY_DURIEL, 1776.73f, -2049.06f, 109.83f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
-                            me->SummonCreature(ENTRY_SILVERWING_SENTINEL, 1774.64f, -2049.41f, 109.83f, 1.40f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
-                            me->SummonCreature(ENTRY_SILVERWING_WARRIOR, 1778.73f, -2049.50f, 109.83f, 1.67f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
-                            break;
-                        case 20:
-                            Talk(SAY_WIN, player);
-                            Completed = true;
-                            player->GroupEventHappens(QUEST_TOREK_ASSULT, me);
-                            break;
-                        case 21:
-                            Talk(SAY_END, player);
-                            break;
-                    }
+                    case 1:
+                        Talk(SAY_MOVE, player);
+                        break;
+                    case 8:
+                        Talk(SAY_PREPARE, player);
+                        break;
+                    case 19:
+                        /// @todo verify location and creatures amount.
+                        me->SummonCreature(NPC_DURIEL, 1776.73f, -2049.06f, 109.83f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
+                        me->SummonCreature(NPC_SILVERWING_SENTINEL, 1774.64f, -2049.41f, 109.83f, 1.40f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
+                        me->SummonCreature(NPC_SILVERWING_WARRIOR, 1778.73f, -2049.50f, 109.83f, 1.67f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
+                        break;
+                    case 20:
+                        Talk(SAY_WIN, player);
+                        _completed = true;
+                        player->GroupEventHappens(QUEST_TOREK_ASSULT, me);
+                        break;
+                    case 21:
+                        Talk(SAY_END, player);
+                        break;
                 }
             }
+        }
 
-            void Reset() OVERRIDE
-            {
-                Rend_Timer = 5000;
-                Thunderclap_Timer = 8000;
-                Completed = false;
-            }
+        void UpdateAI(uint32 diff) OVERRIDE
+        {
+            npc_escortAI::UpdateAI(diff);
 
-            void EnterCombat(Unit* /*who*/) OVERRIDE
-            {
-            }
+            if (!UpdateVictim())
+                return;
 
-            void JustSummoned(Creature* summoned) OVERRIDE
+            if (rend_Timer <= diff)
             {
-                summoned->AI()->AttackStart(me);
-            }
+                DoCastVictim(SPELL_REND);
+                rend_Timer = 20000;
+            } else rend_Timer -= diff;
 
-            void UpdateAI(uint32 diff) OVERRIDE
+            if (thunderclap_Timer <= diff)
             {
-                npc_escortAI::UpdateAI(diff);
-
-                if (!UpdateVictim())
-                    return;
-
-                if (Rend_Timer <= diff)
-                {
-                    DoCastVictim(SPELL_REND);
-                    Rend_Timer = 20000;
-                } else Rend_Timer -= diff;
-
-                if (Thunderclap_Timer <= diff)
-                {
-                    DoCast(me, SPELL_THUNDERCLAP);
-                    Thunderclap_Timer = 30000;
-                } else Thunderclap_Timer -= diff;
-            }
-        };
-
-        CreatureAI* GetAI(Creature* creature) const OVERRIDE
-        {
-            return new npc_torekAI(creature);
+                DoCast(me, SPELL_THUNDERCLAP);
+                thunderclap_Timer = 30000;
+            } else thunderclap_Timer -= diff;
         }
 
-        bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE
-        {
-            if (quest->GetQuestId() == QUEST_TOREK_ASSULT)
-            {
-                /// @todo find companions, make them follow Torek, at any time (possibly done by core/database in future?)
-                creature->AI()->Talk(SAY_READY, player);
-                creature->setFaction(113);
+    private:
+        uint32 rend_Timer;
+        uint32 thunderclap_Timer;
+        bool   _completed;
 
-                if (npc_escortAI* pEscortAI = CAST_AI(npc_torekAI, creature->AI()))
-                    pEscortAI->Start(true, true, player->GetGUID());
-            }
+    };
 
-            return true;
-        }
+    CreatureAI* GetAI(Creature* creature) const OVERRIDE
+    {
+        return new npc_torekAI(creature);
+    }
 };
 
 /*####
@@ -175,96 +160,90 @@ enum RuulSnowhoof
     NPC_THISTLEFUR_URSA         = 3921,
     NPC_THISTLEFUR_TOTEMIC      = 3922,
     NPC_THISTLEFUR_PATHFINDER   = 3926,
-
     QUEST_FREEDOM_TO_RUUL       = 6482,
-
     GO_CAGE                     = 178147
 };
 
 Position const RuulSnowhoofSummonsCoord[6] =
 {
-    {3449.218018f, -587.825073f, 174.978867f, 4.714445f},
-    {3446.384521f, -587.830872f, 175.186279f, 4.714445f},
-    {3444.218994f, -587.835327f, 175.380600f, 4.714445f},
-    {3508.344482f, -492.024261f, 186.929031f, 4.145029f},
-    {3506.265625f, -490.531006f, 186.740128f, 4.239277f},
-    {3503.682373f, -489.393799f, 186.629684f, 4.349232f}
+    { 3449.218018f, -587.825073f, 174.978867f, 4.714445f },
+    { 3446.384521f, -587.830872f, 175.186279f, 4.714445f },
+    { 3444.218994f, -587.835327f, 175.380600f, 4.714445f },
+    { 3508.344482f, -492.024261f, 186.929031f, 4.145029f },
+    { 3506.265625f, -490.531006f, 186.740128f, 4.239277f },
+    { 3503.682373f, -489.393799f, 186.629684f, 4.349232f }
 };
 
 class npc_ruul_snowhoof : public CreatureScript
 {
-    public:
-        npc_ruul_snowhoof() : CreatureScript("npc_ruul_snowhoof") { }
+public:
+    npc_ruul_snowhoof() : CreatureScript("npc_ruul_snowhoof") { }
 
-        struct npc_ruul_snowhoofAI : public npc_escortAI
-        {
-            npc_ruul_snowhoofAI(Creature* creature) : npc_escortAI(creature) { }
+    struct npc_ruul_snowhoofAI : public npc_escortAI
+    {
+        npc_ruul_snowhoofAI(Creature* creature) : npc_escortAI(creature) { }
 
-            void WaypointReached(uint32 waypointId) OVERRIDE
-            {
-                Player* player = GetPlayerForEscort();
-                if (!player)
-                    return;
+        void Reset() OVERRIDE
+        {
+            if (GameObject* Cage = me->FindNearestGameObject(GO_CAGE, 20))
+                Cage->SetGoState(GO_STATE_READY);
+        }
 
-                switch (waypointId)
-                {
-                    case 0:
-                        me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
-                        if (GameObject* Cage = me->FindNearestGameObject(GO_CAGE, 20))
-                            Cage->SetGoState(GO_STATE_ACTIVE);
-                        break;
-                    case 13:
-                        me->SummonCreature(NPC_THISTLEFUR_TOTEMIC, RuulSnowhoofSummonsCoord[0], TEMPSUMMON_DEAD_DESPAWN, 60000);
-                        me->SummonCreature(NPC_THISTLEFUR_URSA, RuulSnowhoofSummonsCoord[1], TEMPSUMMON_DEAD_DESPAWN, 60000);
-                        me->SummonCreature(NPC_THISTLEFUR_PATHFINDER, RuulSnowhoofSummonsCoord[2], TEMPSUMMON_DEAD_DESPAWN, 60000);
-                        break;
-                    case 19:
-                        me->SummonCreature(NPC_THISTLEFUR_TOTEMIC, RuulSnowhoofSummonsCoord[3], TEMPSUMMON_DEAD_DESPAWN, 60000);
-                        me->SummonCreature(NPC_THISTLEFUR_URSA, RuulSnowhoofSummonsCoord[4], TEMPSUMMON_DEAD_DESPAWN, 60000);
-                        me->SummonCreature(NPC_THISTLEFUR_PATHFINDER, RuulSnowhoofSummonsCoord[5], TEMPSUMMON_DEAD_DESPAWN, 60000);
-                        break;
-                    case 21:
-                        player->GroupEventHappens(QUEST_FREEDOM_TO_RUUL, me);
-                        break;
-                }
-            }
+        void EnterCombat(Unit* /*who*/) OVERRIDE { }
 
-            void EnterCombat(Unit* /*who*/) OVERRIDE { }
+        void JustSummoned(Creature* summoned) OVERRIDE
+        {
+            summoned->AI()->AttackStart(me);
+        }
 
-            void Reset() OVERRIDE
+        void sQuestAccept(Player* player, Quest const* quest)
+        {
+            if (quest->GetQuestId() == QUEST_TOREK_ASSULT)
             {
-                if (GameObject* Cage = me->FindNearestGameObject(GO_CAGE, 20))
-                    Cage->SetGoState(GO_STATE_READY);
+                me->setFaction(FACTION_QUEST);
+                npc_escortAI::Start(true, false, player->GetGUID());
             }
+        }
 
-            void JustSummoned(Creature* summoned) OVERRIDE
-            {
-                summoned->AI()->AttackStart(me);
-            }
+        void WaypointReached(uint32 waypointId) OVERRIDE
+        {
+            Player* player = GetPlayerForEscort();
+            if (!player)
+                return;
 
-            void UpdateAI(uint32 diff) OVERRIDE
+            switch (waypointId)
             {
-                npc_escortAI::UpdateAI(diff);
+                case 0:
+                    me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
+                    if (GameObject* Cage = me->FindNearestGameObject(GO_CAGE, 20))
+                        Cage->SetGoState(GO_STATE_ACTIVE);
+                    break;
+                case 13:
+                    me->SummonCreature(NPC_THISTLEFUR_TOTEMIC, RuulSnowhoofSummonsCoord[0], TEMPSUMMON_DEAD_DESPAWN, 60000);
+                    me->SummonCreature(NPC_THISTLEFUR_URSA, RuulSnowhoofSummonsCoord[1], TEMPSUMMON_DEAD_DESPAWN, 60000);
+                    me->SummonCreature(NPC_THISTLEFUR_PATHFINDER, RuulSnowhoofSummonsCoord[2], TEMPSUMMON_DEAD_DESPAWN, 60000);
+                    break;
+                case 19:
+                    me->SummonCreature(NPC_THISTLEFUR_TOTEMIC, RuulSnowhoofSummonsCoord[3], TEMPSUMMON_DEAD_DESPAWN, 60000);
+                    me->SummonCreature(NPC_THISTLEFUR_URSA, RuulSnowhoofSummonsCoord[4], TEMPSUMMON_DEAD_DESPAWN, 60000);
+                    me->SummonCreature(NPC_THISTLEFUR_PATHFINDER, RuulSnowhoofSummonsCoord[5], TEMPSUMMON_DEAD_DESPAWN, 60000);
+                    break;
+                case 21:
+                    player->GroupEventHappens(QUEST_FREEDOM_TO_RUUL, me);
+                    break;
             }
-        };
-
-        CreatureAI* GetAI(Creature* creature) const OVERRIDE
-        {
-            return new npc_ruul_snowhoofAI(creature);
         }
 
-        bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE
+        void UpdateAI(uint32 diff) OVERRIDE
         {
-            if (quest->GetQuestId() == QUEST_FREEDOM_TO_RUUL)
-            {
-                creature->setFaction(113);
-
-                if (npc_escortAI* pEscortAI = CAST_AI(npc_ruul_snowhoofAI, (creature->AI())))
-                    pEscortAI->Start(true, false, player->GetGUID());
-            }
-
-            return true;
+            npc_escortAI::UpdateAI(diff);
         }
+    };
+
+    CreatureAI* GetAI(Creature* creature) const OVERRIDE
+    {
+        return new npc_ruul_snowhoofAI(creature);
+    }
 };
 
 enum Muglash
@@ -298,37 +277,68 @@ enum Muglash
 
 Position const FirstNagaCoord[3] =
 {
-    {3603.504150f, 1122.631104f, 1.635f, 0.0f},         // rider
-    {3589.293945f, 1148.664063f, 5.565f, 0.0f},         // sorceress
-    {3609.925537f, 1168.759521f, -1.168f, 0.0f}         // razortail
+    { 3603.504150f, 1122.631104f,  1.635f, 0.0f },        // rider
+    { 3589.293945f, 1148.664063f,  5.565f, 0.0f },        // sorceress
+    { 3609.925537f, 1168.759521f, -1.168f, 0.0f }         // razortail
 };
 
 Position const SecondNagaCoord[3] =
 {
-    {3609.925537f, 1168.759521f, -1.168f, 0.0f},        // witch
-    {3645.652100f, 1139.425415f, 1.322f, 0.0f},         // priest
-    {3583.602051f, 1128.405762f, 2.347f, 0.0f}          // myrmidon
+    { 3609.925537f, 1168.759521f, -1.168f, 0.0f },        // witch
+    { 3645.652100f, 1139.425415f, 1.322f,  0.0f },        // priest
+    { 3583.602051f, 1128.405762f, 2.347f,  0.0f }         // myrmidon
 };
 
 Position const VorshaCoord = {3633.056885f, 1172.924072f, -5.388f, 0.0f};
 
 class npc_muglash : public CreatureScript
 {
-    public:
-        npc_muglash() : CreatureScript("npc_muglash") { }
+public:
+    npc_muglash() : CreatureScript("npc_muglash") { }
+
+    struct npc_muglashAI : public npc_escortAI
+    {
+        npc_muglashAI(Creature* creature) : npc_escortAI(creature) { }
+
+        void Reset() OVERRIDE
+        {
+            eventTimer = 10000;
+            waveId = 0;
+            _isBrazierExtinguished = false;
+        }
+
+        void EnterCombat(Unit* /*who*/) OVERRIDE
+        {
+            if (Player* player = GetPlayerForEscort())
+                if (HasEscortState(STATE_ESCORT_PAUSED))
+                {
+                    if (urand(0, 1))
+                        Talk(SAY_MUG_ON_GUARD, player);
+                    return;
+                }
+        }
 
-        struct npc_muglashAI : public npc_escortAI
+        void JustDied(Unit* /*killer*/) OVERRIDE
         {
-            npc_muglashAI(Creature* creature) : npc_escortAI(creature) { }
+            if (HasEscortState(STATE_ESCORT_ESCORTING))
+                if (Player* player = GetPlayerForEscort())
+                    player->FailQuest(QUEST_VORSHA);
+        }
 
-            uint8 WaveId;
-            uint32 EventTimer;
-            bool IsBrazierExtinguished;
+        void JustSummoned(Creature* summoned) OVERRIDE
+        {
+            summoned->AI()->AttackStart(me);
+        }
 
-            void JustSummoned(Creature* summoned) OVERRIDE
+        void sQuestAccept(Player* player, Quest const* quest)
+        {
+            if (quest->GetQuestId() == QUEST_VORSHA)
             {
-                summoned->AI()->AttackStart(me);
+                Talk(SAY_MUG_START1);
+                me->setFaction(FACTION_QUEST);
+                npc_escortAI::Start(true, false, player->GetGUID());
             }
+        }
 
             void WaypointReached(uint32 waypointId) OVERRIDE
             {
@@ -362,34 +372,9 @@ class npc_muglash : public CreatureScript
                 }
             }
 
-            void EnterCombat(Unit* /*who*/) OVERRIDE
-            {
-                if (Player* player = GetPlayerForEscort())
-                    if (HasEscortState(STATE_ESCORT_PAUSED))
-                    {
-                        if (urand(0, 1))
-                            Talk(SAY_MUG_ON_GUARD, player);
-                        return;
-                    }
-            }
-
-            void Reset() OVERRIDE
-            {
-                EventTimer = 10000;
-                WaveId = 0;
-                IsBrazierExtinguished = false;
-            }
-
-            void JustDied(Unit* /*killer*/) OVERRIDE
-            {
-                if (HasEscortState(STATE_ESCORT_ESCORTING))
-                    if (Player* player = GetPlayerForEscort())
-                        player->FailQuest(QUEST_VORSHA);
-            }
-
             void DoWaveSummon()
             {
-                switch (WaveId)
+                switch (waveId)
                 {
                     case 1:
                         me->SummonCreature(NPC_WRATH_RIDER,     FirstNagaCoord[0], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
@@ -411,48 +396,40 @@ class npc_muglash : public CreatureScript
                 }
             }
 
-            void UpdateAI(uint32 uiDiff) OVERRIDE
+            void UpdateAI(uint32 diff) OVERRIDE
             {
-                npc_escortAI::UpdateAI(uiDiff);
+                npc_escortAI::UpdateAI(diff);
 
                 if (!me->GetVictim())
                 {
-                    if (HasEscortState(STATE_ESCORT_PAUSED) && IsBrazierExtinguished)
+                    if (HasEscortState(STATE_ESCORT_PAUSED) && _isBrazierExtinguished)
                     {
-                        if (EventTimer < uiDiff)
+                        if (eventTimer < diff)
                         {
-                            ++WaveId;
+                            ++waveId;
                             DoWaveSummon();
-                            EventTimer = 10000;
+                            eventTimer = 10000;
                         }
                         else
-                            EventTimer -= uiDiff;
+                            eventTimer -= diff;
                     }
                     return;
                 }
                 DoMeleeAttackIfReady();
             }
-        };
 
-        CreatureAI* GetAI(Creature* creature) const OVERRIDE
-        {
-            return new npc_muglashAI(creature);
-        }
+    private:
+        uint32 eventTimer;
+        uint8  waveId;
+    public:
+        bool   _isBrazierExtinguished;
 
-        bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE
-        {
-            if (quest->GetQuestId() == QUEST_VORSHA)
-            {
-                if (npc_muglashAI* pEscortAI = CAST_AI(npc_muglashAI, creature->AI()))
-                {
-                    creature->AI()->Talk(SAY_MUG_START1);
-                    creature->setFaction(113);
+    };
 
-                    pEscortAI->Start(true, false, player->GetGUID());
-                }
-            }
-            return true;
-        }
+    CreatureAI* GetAI(Creature* creature) const OVERRIDE
+    {
+        return new npc_muglashAI(creature);
+    }
 };
 
 class go_naga_brazier : public GameObjectScript
@@ -468,7 +445,7 @@ class go_naga_brazier : public GameObjectScript
                 {
                     creature->AI()->Talk(SAY_MUG_BRAZIER_WAIT);
 
-                    pEscortAI->IsBrazierExtinguished = true;
+                    pEscortAI->_isBrazierExtinguished = true;
                     return false;
                 }
             }
diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
index c2ae69373a0..c225c3a8576 100644
--- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
@@ -48,9 +48,7 @@ EndContentData */
 enum draeneiSurvivor
 {
     SAY_HEAL            = 0,
-
     SAY_HELP            = 1,
-
     SPELL_IRRIDATION    = 35046,
     SPELL_STUNNED       = 28630
 };
@@ -60,11 +58,6 @@ class npc_draenei_survivor : public CreatureScript
 public:
     npc_draenei_survivor() : CreatureScript("npc_draenei_survivor") { }
 
-    CreatureAI* GetAI(Creature* creature) const OVERRIDE
-    {
-        return new npc_draenei_survivorAI(creature);
-    }
-
     struct npc_draenei_survivorAI : public ScriptedAI
     {
         npc_draenei_survivorAI(Creature* creature) : ScriptedAI(creature) { }
@@ -167,6 +160,10 @@ public:
         }
     };
 
+    CreatureAI* GetAI(Creature* creature) const OVERRIDE
+    {
+        return new npc_draenei_survivorAI(creature);
+    }
 };
 
 /*######
@@ -186,39 +183,11 @@ enum Overgrind
     SPELL_DYNAMITE  = 7978
 };
 
-#define GOSSIP_FIGHT "Traitor! You will be brought to justice!"
-
 class npc_engineer_spark_overgrind : public CreatureScript
 {
 public:
     npc_engineer_spark_overgrind() : CreatureScript("npc_engineer_spark_overgrind") { }
 
-    bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE
-    {
-        player->PlayerTalkClass->ClearMenus();
-        if (action == GOSSIP_ACTION_INFO_DEF)
-        {
-            player->CLOSE_GOSSIP_MENU();
-            creature->setFaction(FACTION_HOSTILE);
-            CAST_AI(npc_engineer_spark_overgrind::npc_engineer_spark_overgrindAI, creature->AI())->AttackStart(player);
-        }
-        return true;
-    }
-
-    bool OnGossipHello(Player* player, Creature* creature) OVERRIDE
-    {
-        if (player->GetQuestStatus(QUEST_GNOMERCY) == QUEST_STATUS_INCOMPLETE)
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
-
-        player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
-        return true;
-    }
-
-    CreatureAI* GetAI(Creature* creature) const OVERRIDE
-    {
-        return new npc_engineer_spark_overgrindAI(creature);
-    }
-
     struct npc_engineer_spark_overgrindAI : public ScriptedAI
     {
         npc_engineer_spark_overgrindAI(Creature* creature) : ScriptedAI(creature)
@@ -230,14 +199,6 @@ public:
                 IsTreeEvent = true;
         }
 
-        uint32 NormFaction;
-        uint32 NpcFlags;
-
-        uint32 DynamiteTimer;
-        uint32 EmoteTimer;
-
-        bool IsTreeEvent;
-
         void Reset() OVERRIDE
         {
             DynamiteTimer = 8000;
@@ -254,6 +215,13 @@ public:
             Talk(ATTACK_YELL, who);
         }
 
+        void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) OVERRIDE
+        {
+            player->CLOSE_GOSSIP_MENU();
+            me->setFaction(FACTION_HOSTILE);
+            me->Attack(player, true);
+        }
+
         void UpdateAI(uint32 diff) OVERRIDE
         {
             if (!me->IsInCombat() && !IsTreeEvent)
@@ -279,8 +247,19 @@ public:
 
             DoMeleeAttackIfReady();
         }
+
+    private:
+        uint32 NormFaction;
+        uint32 NpcFlags;
+        uint32 DynamiteTimer;
+        uint32 EmoteTimer;
+        bool   IsTreeEvent;
     };
 
+    CreatureAI* GetAI(Creature* creature) const OVERRIDE
+    {
+        return new npc_engineer_spark_overgrindAI(creature);
+    }
 };
 
 /*######
@@ -292,11 +271,6 @@ class npc_injured_draenei : public CreatureScript
 public:
     npc_injured_draenei() : CreatureScript("npc_injured_draenei") { }
 
-    CreatureAI* GetAI(Creature* creature) const OVERRIDE
-    {
-        return new npc_injured_draeneiAI(creature);
-    }
-
     struct npc_injured_draeneiAI : public ScriptedAI
     {
         npc_injured_draeneiAI(Creature* creature) : ScriptedAI(creature) { }
@@ -321,10 +295,13 @@ public:
 
         void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { }
 
-
         void UpdateAI(uint32 /*diff*/) OVERRIDE { }
     };
 
+    CreatureAI* GetAI(Creature* creature) const OVERRIDE
+    {
+        return new npc_injured_draeneiAI(creature);
+    }
 };
 
 /*######
@@ -339,8 +316,8 @@ enum Magwin
     SAY_END1                    = 3,
     SAY_END2                    = 4,
     EMOTE_HUG                   = 5,
-
-    QUEST_A_CRY_FOR_SAY_HELP    = 9528
+    QUEST_A_CRY_FOR_SAY_HELP    = 9528,
+    FACTION_QUEST               = 113
 };
 
 class npc_magwin : public CreatureScript
@@ -348,25 +325,25 @@ class npc_magwin : public CreatureScript
 public:
     npc_magwin() : CreatureScript("npc_magwin") { }
 
-    bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE
+    struct npc_magwinAI : public npc_escortAI
     {
-        if (quest->GetQuestId() == QUEST_A_CRY_FOR_SAY_HELP)
+        npc_magwinAI(Creature* creature) : npc_escortAI(creature) { }
+
+        void Reset() OVERRIDE { }
+
+        void EnterCombat(Unit* who) OVERRIDE
         {
-            creature->setFaction(113);
-            if (npc_escortAI* pEscortAI = CAST_AI(npc_escortAI, creature->AI()))
-                pEscortAI->Start(true, false, player->GetGUID());
+            Talk(SAY_AGGRO, who);
         }
-        return true;
-    }
 
-    CreatureAI* GetAI(Creature* creature) const OVERRIDE
-    {
-        return new npc_magwinAI(creature);
-    }
-
-    struct npc_magwinAI : public npc_escortAI
-    {
-        npc_magwinAI(Creature* creature) : npc_escortAI(creature) { }
+        void sQuestAccept(Player* player, Quest const* quest)
+        {
+            if (quest->GetQuestId() == QUEST_A_CRY_FOR_SAY_HELP)
+            {
+                me->setFaction(FACTION_QUEST);
+                npc_escortAI::Start(true, false, player->GetGUID());
+            }
+        }
 
         void WaypointReached(uint32 waypointId) OVERRIDE
         {
@@ -391,15 +368,12 @@ public:
                 }
             }
         }
-
-        void EnterCombat(Unit* who) OVERRIDE
-        {
-            Talk(SAY_AGGRO, who);
-        }
-
-        void Reset() OVERRIDE { }
     };
 
+    CreatureAI* GetAI(Creature* creature) const OVERRIDE
+    {
+        return new npc_magwinAI(creature);
+    }
 };
 
 /*######
@@ -433,11 +407,6 @@ class npc_geezle : public CreatureScript
 public:
     npc_geezle() : CreatureScript("npc_geezle") { }
 
-    CreatureAI* GetAI(Creature* creature) const OVERRIDE
-    {
-        return new npc_geezleAI(creature);
-    }
-
     struct npc_geezleAI : public ScriptedAI
     {
         npc_geezleAI(Creature* creature) : ScriptedAI(creature) { }
@@ -568,6 +537,10 @@ public:
         }
     };
 
+    CreatureAI* GetAI(Creature* creature) const OVERRIDE
+    {
+        return new npc_geezleAI(creature);
+    }
 };
 
 enum RavegerCage
@@ -606,11 +579,6 @@ class npc_death_ravager : public CreatureScript
 public:
     npc_death_ravager() : CreatureScript("npc_death_ravager") { }
 
-    CreatureAI* GetAI(Creature* creature) const OVERRIDE
-    {
-        return new npc_death_ravagerAI(creature);
-    }
-
     struct npc_death_ravagerAI : public ScriptedAI
     {
         npc_death_ravagerAI(Creature* creature) : ScriptedAI(creature){ }
@@ -650,6 +618,10 @@ public:
         }
     };
 
+    CreatureAI* GetAI(Creature* creature) const OVERRIDE
+    {
+        return new npc_death_ravagerAI(creature);
+    }
 };
 
 /*########
diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
index 694d63d5295..f71c07b5c7d 100644
--- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
@@ -19,18 +19,18 @@
 /* ScriptData
 SDName: Bloodmyst_Isle
 SD%Complete: 80
-SDComment: Quest support: 9670, 9756(gossip items text needed).
+SDComment: Quest support: 9670, 9667
 SDCategory: Bloodmyst Isle
 EndScriptData */
 
 /* ContentData
 npc_webbed_creature
-npc_captured_sunhawk_agent
+npc_princess_stillpine
+go_princess_stillpines_cage
 EndContentData */
 
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
-#include "ScriptedGossip.h"
 #include "Player.h"
 
 /*######
@@ -40,16 +40,16 @@ EndContentData */
 //possible creatures to be spawned
 uint32 const possibleSpawns[32] = {17322, 17661, 17496, 17522, 17340, 17352, 17333, 17524, 17654, 17348, 17339, 17345, 17359, 17353, 17336, 17550, 17330, 17701, 17321, 17680, 17325, 17320, 17683, 17342, 17715, 17334, 17341, 17338, 17337, 17346, 17344, 17327};
 
+enum WebbedCreature
+{
+    NPC_EXPEDITION_RESEARCHER                     = 17681
+};
+
 class npc_webbed_creature : public CreatureScript
 {
 public:
     npc_webbed_creature() : CreatureScript("npc_webbed_creature") { }
 
-    CreatureAI* GetAI(Creature* creature) const OVERRIDE
-    {
-        return new npc_webbed_creatureAI(creature);
-    }
-
     struct npc_webbed_creatureAI : public ScriptedAI
     {
         npc_webbed_creatureAI(Creature* creature) : ScriptedAI(creature) { }
@@ -65,9 +65,8 @@ public:
             switch (urand(0, 2))
             {
                 case 0:
-                    spawnCreatureID = 17681;
                     if (Player* player = killer->ToPlayer())
-                        player->KilledMonsterCredit(spawnCreatureID, 0);
+                        player->KilledMonsterCredit(NPC_EXPEDITION_RESEARCHER, 0);
                     break;
                 case 1:
                 case 2:
@@ -80,72 +79,10 @@ public:
         }
     };
 
-};
-
-/*######
-## npc_captured_sunhawk_agent
-######*/
-
-#define C_SUNHAWK_TRIGGER 17974
-
-#define GOSSIP_HELLO_CSA     "[PH] "
-#define GOSSIP_SELECT_CSA1   "[PH] "
-#define GOSSIP_SELECT_CSA2   "[PH] "
-#define GOSSIP_SELECT_CSA3   "[PH] "
-#define GOSSIP_SELECT_CSA4   "[PH] "
-#define GOSSIP_SELECT_CSA5   "[PH] "
-
-class npc_captured_sunhawk_agent : public CreatureScript
-{
-public:
-    npc_captured_sunhawk_agent() : CreatureScript("npc_captured_sunhawk_agent") { }
-
-    bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE
-    {
-        player->PlayerTalkClass->ClearMenus();
-        switch (action)
-        {
-            case GOSSIP_ACTION_INFO_DEF+1:
-                player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_CSA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
-                player->SEND_GOSSIP_MENU(9137, creature->GetGUID());
-                break;
-            case GOSSIP_ACTION_INFO_DEF+2:
-                player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_CSA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
-                player->SEND_GOSSIP_MENU(9138, creature->GetGUID());
-                break;
-            case GOSSIP_ACTION_INFO_DEF+3:
-                player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_CSA3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
-                player->SEND_GOSSIP_MENU(9139, creature->GetGUID());
-                break;
-            case GOSSIP_ACTION_INFO_DEF+4:
-                player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_CSA4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
-                player->SEND_GOSSIP_MENU(9140, creature->GetGUID());
-                break;
-            case GOSSIP_ACTION_INFO_DEF+5:
-                player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_CSA5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
-                player->SEND_GOSSIP_MENU(9141, creature->GetGUID());
-                break;
-            case GOSSIP_ACTION_INFO_DEF+6:
-                player->CLOSE_GOSSIP_MENU();
-                player->TalkedToCreature(C_SUNHAWK_TRIGGER, creature->GetGUID());
-                break;
-        }
-        return true;
-    }
-
-    bool OnGossipHello(Player* player, Creature* creature) OVERRIDE
+    CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        if (player->HasAura(31609) && player->GetQuestStatus(9756) == QUEST_STATUS_INCOMPLETE)
-        {
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_CSA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-            player->SEND_GOSSIP_MENU(9136, creature->GetGUID());
-        }
-        else
-            player->SEND_GOSSIP_MENU(9134, creature->GetGUID());
-
-        return true;
+        return new npc_webbed_creatureAI(creature);
     }
-
 };
 
 /*######
@@ -206,7 +143,6 @@ public:
 void AddSC_bloodmyst_isle()
 {
     new npc_webbed_creature();
-    new npc_captured_sunhawk_agent();
     new npc_princess_stillpine();
     new go_princess_stillpines_cage();
 }
diff --git a/src/server/scripts/Kalimdor/zone_desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp
index 4590b21f132..4f11a2ee169 100644
--- a/src/server/scripts/Kalimdor/zone_desolace.cpp
+++ b/src/server/scripts/Kalimdor/zone_desolace.cpp
@@ -59,18 +59,6 @@ class npc_aged_dying_ancient_kodo : public CreatureScript
 public:
     npc_aged_dying_ancient_kodo() : CreatureScript("npc_aged_dying_ancient_kodo") { }
 
-    bool OnGossipHello(Player* player, Creature* creature)
-    {
-        if (player->HasAura(SPELL_KODO_KOMBO_PLAYER_BUFF) && creature->HasAura(SPELL_KODO_KOMBO_DESPAWN_BUFF))
-        {
-            player->TalkedToCreature(creature->GetEntry(), 0);
-            player->RemoveAurasDueToSpell(SPELL_KODO_KOMBO_PLAYER_BUFF);
-        }
-
-        player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
-        return true;
-    }
-
     struct npc_aged_dying_ancient_kodoAI : public ScriptedAI
     {
         npc_aged_dying_ancient_kodoAI(Creature* creature) : ScriptedAI(creature) { }
@@ -108,6 +96,18 @@ public:
         }
     };
 
+    bool OnGossipHello(Player* player, Creature* creature) OVERRIDE
+    {
+        if (player->HasAura(SPELL_KODO_KOMBO_PLAYER_BUFF) && creature->HasAura(SPELL_KODO_KOMBO_DESPAWN_BUFF))
+        {
+            player->TalkedToCreature(creature->GetEntry(), 0);
+            player->RemoveAurasDueToSpell(SPELL_KODO_KOMBO_PLAYER_BUFF);
+        }
+
+        player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
+        return true;
+    }
+
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
         return new npc_aged_dying_ancient_kodoAI(creature);
@@ -122,8 +122,7 @@ public:
 enum DemonPortal
 {
     NPC_DEMON_GUARDIAN          = 11937,
-
-    QUEST_PORTAL_OF_THE_LEGION  = 5581,
+    QUEST_PORTAL_OF_THE_LEGION  = 5581
 };
 
 class go_demon_portal : public GameObjectScript
diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp
index 49b557e9fab..849f72d2fc8 100644
--- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp
+++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp
@@ -340,10 +340,7 @@ public:
             BigWill = 0;
         }
 
-        void EnterCombat(Unit* /*who*/) OVERRIDE { }
-
         void MoveInLineOfSight(Unit* who) OVERRIDE
-
         {
             if (!who || !who->IsAlive() || EventInProgress)
                 return;
@@ -357,8 +354,6 @@ public:
                     }
         }
 
-        void KilledUnit(Unit* /*victim*/) OVERRIDE { }
-
         void UpdateAI(uint32 diff) OVERRIDE
         {
             if (EventInProgress)
author	DDuarte <dnpd.dd@gmail.com>	2014-01-10 18:32:05 +0000
committer	DDuarte <dnpd.dd@gmail.com>	2014-01-10 18:32:05 +0000
commit	33c2bd5ce1f4f8d20981e9f7aea90e37de0abbda (patch)
tree	823ad5570f27e923c77203660ee7cc12e26182ec /src/server/scripts/Kalimdor
parent	352a2682b1d531c83bd2b80704233677448e99de (diff)
parent	a63780fd90701ed81a0a5f2030e82ab1f6927ab4 (diff)