From 0f150881a12e7c7936e9672dc1a7b25778a65589 Mon Sep 17 00:00:00 2001 From: megamage Date: Fri, 16 Jan 2009 19:34:49 -0600 Subject: *Do not let target get in combat until hit by attacker. --HG-- branch : trunk --- src/bindings/scripts/include/sc_creature.cpp | 3 --- src/bindings/scripts/scripts/creature/mob_event_ai.cpp | 1 - 2 files changed, 4 deletions(-) (limited to 'src/bindings/scripts') diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp index 12992eedc52..0caa102d56d 100644 --- a/src/bindings/scripts/include/sc_creature.cpp +++ b/src/bindings/scripts/include/sc_creature.cpp @@ -86,7 +86,6 @@ void ScriptedAI::AttackStart(Unit* who, bool melee) { m_creature->AddThreat(who, 0.0f); m_creature->SetInCombatWith(who); - who->SetInCombatWith(m_creature); if (!InCombat) { @@ -110,7 +109,6 @@ void ScriptedAI::AttackStart(Unit* who) { m_creature->AddThreat(who, 0.0f); m_creature->SetInCombatWith(who); - who->SetInCombatWith(m_creature); if (!InCombat) { @@ -823,7 +821,6 @@ void Scripted_NoMovementAI::AttackStart(Unit* who) { m_creature->AddThreat(who, 0.0f); m_creature->SetInCombatWith(who); - who->SetInCombatWith(m_creature); 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 456a88ab3bb..eee4269e12c 100644 --- a/src/bindings/scripts/scripts/creature/mob_event_ai.cpp +++ b/src/bindings/scripts/scripts/creature/mob_event_ai.cpp @@ -1152,7 +1152,6 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI //Begin melee attack if we are within range m_creature->AddThreat(who, 0.0f); m_creature->SetInCombatWith(who); - who->SetInCombatWith(m_creature); if (!InCombat) { -- cgit v1.2.3