*Disable commit 4821 / 9d0967884f0b (caused some NPCs to not regenerate HP when they should), found by Gyullo and tested by Manuel

--HG--
branch : trunk

1 files changed, 3 insertions, 2 deletions

diff --git a/src/game/CreatureAI.cpp b/src/game/CreatureAI.cpp
index a3a903c23a6..a846d392d4c 100644
--- a/src/game/CreatureAI.cpp
+++ b/src/game/CreatureAI.cpp
@@ -93,12 +93,13 @@ void CreatureAI::DoZoneInCombat(Creature* creature)
                 creature->AddThreat(pPlayer, 0.0f);
             }
 
-            for(Unit::ControlList::const_iterator itr = pPlayer->m_Controlled.begin(); itr != pPlayer->m_Controlled.end(); ++itr)
+            // 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)
             {
                 creature->SetInCombatWith(*itr);
                 (*itr)->SetInCombatWith(creature);
                 creature->AddThreat(*itr, 0.0f);
-            }
+            } */
         }
     }
 }