Merge branch 'master' into 4.3.4

Conflicts:
	src/server/scripts/Kalimdor/zone_durotar.cpp

3 files changed, 16 insertions, 9 deletions

diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
index 6bc6633e49e..90b265e2a65 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
@@ -272,9 +272,12 @@ public:
         return new npc_volcanoAI (creature);
     }
 
-    struct npc_volcanoAI : public Scripted_NoMovementAI
+    struct npc_volcanoAI : public ScriptedAI
     {
-        npc_volcanoAI(Creature* creature) : Scripted_NoMovementAI(creature) {}
+        npc_volcanoAI(Creature* creature) : ScriptedAI(creature) 
+        {
+            SetCombatMovement(false);
+        }
 
         void Reset()
         {
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
index 788de7753ff..cade8f34cde 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
@@ -78,10 +78,11 @@ public:
         return new boss_the_lurker_belowAI (creature);
     }
 
-    struct boss_the_lurker_belowAI : public Scripted_NoMovementAI
+    struct boss_the_lurker_belowAI : public ScriptedAI
     {
-        boss_the_lurker_belowAI(Creature* creature) : Scripted_NoMovementAI(creature), Summons(me)
+        boss_the_lurker_belowAI(Creature* creature) : ScriptedAI(creature), Summons(me)
         {
+            SetCombatMovement(false);
             instance = creature->GetInstanceScript();
         }
 
@@ -156,7 +157,6 @@ public:
         {
             if (instance)
                 instance->SetData(DATA_THELURKERBELOWEVENT, IN_PROGRESS);
-            Scripted_NoMovementAI::EnterCombat(who);
         }
 
         void MoveInLineOfSight(Unit* who)
@@ -368,10 +368,11 @@ public:
         return new mob_coilfang_ambusherAI (creature);
     }
 
-    struct mob_coilfang_ambusherAI : public Scripted_NoMovementAI
+    struct mob_coilfang_ambusherAI : public ScriptedAI
     {
-        mob_coilfang_ambusherAI(Creature* creature) : Scripted_NoMovementAI(creature)
+        mob_coilfang_ambusherAI(Creature* creature) : ScriptedAI(creature)
         {
+            SetCombatMovement(false);
         }
 
         uint32 MultiShotTimer;
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index 07d563cd762..8d66e0824b9 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -1404,9 +1404,12 @@ class mob_kael_flamestrike : public CreatureScript
             : CreatureScript("mob_kael_flamestrike")
         {
         }
-        struct mob_kael_flamestrikeAI : public Scripted_NoMovementAI
+        struct mob_kael_flamestrikeAI : public ScriptedAI
         {
-            mob_kael_flamestrikeAI(Creature* creature) : Scripted_NoMovementAI(creature) {}
+            mob_kael_flamestrikeAI(Creature* creature) : ScriptedAI(creature) 
+            {
+                SetCombatMovement(false);
+            }
 
             uint32 Timer;
             bool Casting;