Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 03:12:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-01-16 22:59:24 -06:00
parent 11239e9f5f 0a1c601a1c
commit fa2e6622ad
12 changed files with 146 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/bindings/scripts/include/sc_creature.cpp
View File

@@ -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)
{

1
src/bindings/scripts/scripts/creature/mob_event_ai.cpp
View File

@@ -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)
{