Merge branch 'master' into 4.3.4

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

5 files changed, 42 insertions, 23 deletions

diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
index c186ada72b7..73b52c4185f 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
@@ -345,10 +345,12 @@ public:
         return new boss_alythessAI (creature);
     };
 
-    struct boss_alythessAI : public Scripted_NoMovementAI
+    struct boss_alythessAI : public ScriptedAI
     {
-        boss_alythessAI(Creature* creature) : Scripted_NoMovementAI(creature)
+        boss_alythessAI(Creature* creature) : ScriptedAI(creature)
         {
+            SetCombatMovement(false);
+
             instance = creature->GetInstanceScript();
             IntroStepCounter = 10;
         }
@@ -418,9 +420,7 @@ public:
         void AttackStart(Unit* who)
         {
             if (!me->isInCombat())
-            {
-                Scripted_NoMovementAI::AttackStart(who);
-            }
+                ScriptedAI::AttackStart(who);
         }
 
         void MoveInLineOfSight(Unit* who)
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
index 7718b3682f8..3d9cb69cbae 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
@@ -392,11 +392,13 @@ public:
         return new mob_kiljaeden_controllerAI (creature);
     }
 
-    struct mob_kiljaeden_controllerAI : public Scripted_NoMovementAI
+    struct mob_kiljaeden_controllerAI : public ScriptedAI
     {
-        mob_kiljaeden_controllerAI(Creature* creature) : Scripted_NoMovementAI(creature), summons(me)
+        mob_kiljaeden_controllerAI(Creature* creature) : ScriptedAI(creature), summons(me)
         {
             instance = creature->GetInstanceScript();
+
+            SetCombatMovement(false);
         }
 
         InstanceScript* instance;
@@ -492,11 +494,13 @@ public:
         return new boss_kiljaedenAI (creature);
     }
 
-    struct boss_kiljaedenAI : public Scripted_NoMovementAI
+    struct boss_kiljaedenAI : public ScriptedAI
     {
-        boss_kiljaedenAI(Creature* creature) : Scripted_NoMovementAI(creature), summons(me)
+        boss_kiljaedenAI(Creature* creature) : ScriptedAI(creature), summons(me)
         {
             instance = creature->GetInstanceScript();
+
+            SetCombatMovement(false);
         }
 
         InstanceScript* instance;
@@ -520,7 +524,7 @@ public:
 
         void InitializeAI()
         {
-            Scripted_NoMovementAI::InitializeAI();
+            // Scripted_NoMovementAI::InitializeAI();
         }
 
         void Reset()
@@ -615,7 +619,8 @@ public:
 
         void EnterEvadeMode()
         {
-            Scripted_NoMovementAI::EnterEvadeMode();
+            ScriptedAI::EnterEvadeMode();
+
             summons.DespawnAll();
 
             // Reset the controller
@@ -999,9 +1004,12 @@ public:
         return new mob_felfire_portalAI (creature);
     }
 
-    struct mob_felfire_portalAI : public Scripted_NoMovementAI
+    struct mob_felfire_portalAI : public ScriptedAI
     {
-        mob_felfire_portalAI(Creature* creature) : Scripted_NoMovementAI(creature) {}
+        mob_felfire_portalAI(Creature* creature) : ScriptedAI(creature)
+        {
+            SetCombatMovement(false);
+        }
 
         uint32 uiSpawnFiendTimer;
 
@@ -1100,9 +1108,12 @@ public:
         return new mob_armageddonAI (creature);
     }
 
-    struct mob_armageddonAI : public Scripted_NoMovementAI
+    struct mob_armageddonAI : public ScriptedAI
     {
-        mob_armageddonAI(Creature* creature) : Scripted_NoMovementAI(creature) {}
+        mob_armageddonAI(Creature* creature) : ScriptedAI(creature)
+        {
+            SetCombatMovement(false);
+        }
 
         uint8 spell;
         uint32 uiTimer;
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
index 5eb79258005..b45e55e0605 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
@@ -213,10 +213,11 @@ public:
         return new boss_muruAI (creature);
     }
 
-    struct boss_muruAI : public Scripted_NoMovementAI
+    struct boss_muruAI : public ScriptedAI
     {
-        boss_muruAI(Creature* creature) : Scripted_NoMovementAI(creature), Summons(me)
+        boss_muruAI(Creature* creature) : ScriptedAI(creature), Summons(creature)
         {
+            SetCombatMovement(false);
             instance = creature->GetInstanceScript();
         }
 
@@ -377,10 +378,11 @@ public:
         return new npc_muru_portalAI (creature);
     }
 
-    struct npc_muru_portalAI : public Scripted_NoMovementAI
+    struct npc_muru_portalAI : public ScriptedAI
     {
-        npc_muru_portalAI(Creature* creature) : Scripted_NoMovementAI(creature), Summons(me)
+        npc_muru_portalAI(Creature* creature) : ScriptedAI(creature), Summons(creature)
         {
+            SetCombatMovement(false);
             instance = creature->GetInstanceScript();
         }
 
diff --git a/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp
index 432768a51de..33cb5f649d7 100644
--- a/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp
@@ -551,9 +551,12 @@ public:
         return new npc_infused_crystalAI (creature);
     }
 
-    struct npc_infused_crystalAI : public Scripted_NoMovementAI
+    struct npc_infused_crystalAI : public ScriptedAI
     {
-        npc_infused_crystalAI(Creature* creature) : Scripted_NoMovementAI(creature) {}
+        npc_infused_crystalAI(Creature* creature) : ScriptedAI(creature)
+        {
+            SetCombatMovement(false);
+        }
 
         uint32 EndTimer;
         uint32 WaveTimer;
diff --git a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp
index ee22b766154..6fa3401bcc9 100644
--- a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp
@@ -254,9 +254,12 @@ public:
         return new npc_andorhal_towerAI (creature);
     }
 
-    struct npc_andorhal_towerAI : public Scripted_NoMovementAI
+    struct npc_andorhal_towerAI : public ScriptedAI
     {
-        npc_andorhal_towerAI(Creature* creature) : Scripted_NoMovementAI(creature) {}
+        npc_andorhal_towerAI(Creature* creature) : ScriptedAI(creature) 
+        {
+            SetCombatMovement(false);
+        }
 
         void MoveInLineOfSight(Unit* who)
         {