From 10231efc0f8c81b4b81a424be2cd8c8d91ff8116 Mon Sep 17 00:00:00 2001 From: maximius Date: Sun, 27 Sep 2009 15:52:17 -0700 Subject: *Revert 5675/43c0c883c44d back to 4821/9d0967884f0b way (seems to work properly now), thanks Gyullo --HG-- branch : trunk --- src/game/CreatureAI.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/game/CreatureAI.cpp b/src/game/CreatureAI.cpp index a846d392d4c..a3a903c23a6 100644 --- a/src/game/CreatureAI.cpp +++ b/src/game/CreatureAI.cpp @@ -93,13 +93,12 @@ void CreatureAI::DoZoneInCombat(Creature* creature) creature->AddThreat(pPlayer, 0.0f); } - // TC2 commit 4821 / 9d0967884f0b, disabled (causes some NPCs to not regenerate HP): - /* for(Unit::ControlList::const_iterator itr = pPlayer->m_Controlled.begin(); itr != pPlayer->m_Controlled.end(); ++itr) + 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