*Fix some bugged AI which cause creatures enter evade mode repeatedly.

*Let player enter combat when attacked but not hit by creatures.

--HG--
branch : trunk

8 files changed, 0 insertions, 18 deletions

diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp
index 82e7ab04ca9..c2ae15d9ab1 100644
--- a/src/bindings/scripts/include/sc_creature.cpp
+++ b/src/bindings/scripts/include/sc_creature.cpp
@@ -85,7 +85,6 @@ void ScriptedAI::AttackStart(Unit* who, bool melee)
     if (m_creature->Attack(who, melee))
     {
         m_creature->AddThreat(who, 0.0f);
-        m_creature->SetInCombatWith(who);
 
         if (!InCombat)
         {
@@ -108,7 +107,6 @@ void ScriptedAI::AttackStart(Unit* who)
     if (m_creature->Attack(who, true))
     {
         m_creature->AddThreat(who, 0.0f);
-        m_creature->SetInCombatWith(who);
 
         if (!InCombat)
         {
@@ -834,7 +832,6 @@ void Scripted_NoMovementAI::AttackStart(Unit* who)
     if (m_creature->Attack(who, true))
     {
         m_creature->AddThreat(who, 0.0f);
-        m_creature->SetInCombatWith(who);
 
         if (!InCombat)
         {
diff --git a/src/bindings/scripts/scripts/creature/mob_event_ai.cpp b/src/bindings/scripts/scripts/creature/mob_event_ai.cpp
index 6b46b7aecde..17b2c1b5ace 100644
--- a/src/bindings/scripts/scripts/creature/mob_event_ai.cpp
+++ b/src/bindings/scripts/scripts/creature/mob_event_ai.cpp
@@ -1150,8 +1150,6 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI
         if (m_creature->Attack(who, MeleeEnabled))
          {
             //Begin melee attack if we are within range
-            m_creature->AddThreat(who, 0.0f);
-            m_creature->SetInCombatWith(who);
 
             if (!InCombat)
             {
diff --git a/src/bindings/scripts/scripts/npc/npc_escortAI.cpp b/src/bindings/scripts/scripts/npc/npc_escortAI.cpp
index 88505c44caf..20e6345b9f7 100644
--- a/src/bindings/scripts/scripts/npc/npc_escortAI.cpp
+++ b/src/bindings/scripts/scripts/npc/npc_escortAI.cpp
@@ -35,8 +35,6 @@ void npc_escortAI::AttackStart(Unit *who)
         if ( m_creature->Attack(who, true) )
         {
             m_creature->AddThreat(who, 0.0f);
-			m_creature->SetInCombatWith(who);
-			who->SetInCombatWith(m_creature);
 
         if (!InCombat)
         {
diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp
index a29a2db9321..be2c1830409 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp
+++ b/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp
@@ -440,7 +440,6 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI
                         Akama->AddThreat(m_creature, 10000000.0f);
                         m_creature->Attack(Akama, true);
                         Akama->Attack(m_creature, true);
-						m_creature->SetInCombatWith(Akama);
                     }
                 }
             }
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp
index d152536359b..c8027abaa5b 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp
+++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp
@@ -170,8 +170,6 @@ struct TRINITY_DLL_DECL boss_grand_warlock_nethekurseAI : public ScriptedAI
         if (m_creature->Attack(who, true))
         {
             m_creature->AddThreat(who, 0.0f);
-            m_creature->SetInCombatWith(who);
-            who->SetInCombatWith(m_creature);
 
             if (!InCombat)
             {
diff --git a/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp b/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp
index 22f71e09be0..0709342d424 100644
--- a/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp
+++ b/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp
@@ -522,7 +522,6 @@ struct TRINITY_DLL_DECL npc_dirty_larryAI : public ScriptedAI
 				Malone->setFaction(14);
 				Malone->GetMotionMaster()->MoveChase(player);
 			}
-				m_creature->SetInCombatWith(player);
 				DoStartMovement(player);
 				AttackStart(player);
 			}
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp
index d4433c7afe5..febecd13ce1 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp
+++ b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp
@@ -104,8 +104,6 @@ struct TRINITY_DLL_DECL npc_millhouse_manastormAI : public ScriptedAI
         if (m_creature->Attack(who, true))
         {
             m_creature->AddThreat(who, 0.0f);
-            m_creature->SetInCombatWith(who);
-            who->SetInCombatWith(m_creature);
 
             if (!InCombat)
             {
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp
index d46f7cf519f..39627a30cfb 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp
+++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp
@@ -1211,8 +1211,6 @@ struct TRINITY_DLL_DECL boss_grand_astromancer_capernianAI : public advisorbase_
         if (m_creature->Attack(who, true))
         {
             m_creature->AddThreat(who, 0.0f);
-            m_creature->SetInCombatWith(who);
-            who->SetInCombatWith(m_creature);
 
             if (!InCombat)
             {
@@ -1497,9 +1495,6 @@ struct TRINITY_DLL_DECL mob_phoenix_egg_tkAI : public ScriptedAI
        {
                if (m_creature->Attack(who, false))
                {
-                       m_creature->SetInCombatWith(who);
-                       who->SetInCombatWith(m_creature);
-
                        if (!InCombat)
                        {
                                InCombat = true;