From 9952786d149cc600c71b32787b3e704bd9ed174b Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Sat, 8 Aug 2009 11:56:54 -0500
Subject: *Also aggro player-controlled units in dozoneincombat.

--HG--
branch : trunk
---
 src/game/CreatureAI.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/game/CreatureAI.cpp')

diff --git a/src/game/CreatureAI.cpp b/src/game/CreatureAI.cpp
index 6c6df7ac09e..cfe72f654eb 100644
--- a/src/game/CreatureAI.cpp
+++ b/src/game/CreatureAI.cpp
@@ -91,6 +91,13 @@ void CreatureAI::DoZoneInCombat(Creature* creature)
                 pPlayer->SetInCombatWith(creature);
                 creature->AddThreat(pPlayer, 0.0f);
             }
+
+            for(Unit::ControlList::const_iterator itr = pPlayer->m_Controlled.begin(); itr != pPlayer->m_Controlled.end(); ++itr)
+            {
+                creature->SetInCombatWith(*itr);
+                (*itr)->SetInCombatWith(creature);
+                creature->AddThreat(*itr, 0.0f);
+            }
         }
     }
 }
-- 
cgit v1.2.3