[svn] * Revert change to DoZoneInCombat made in [114] as it can cause problems. DoZoneInCombat is NOT meant to be used by creatures that cannot have threatlists or have empty threatlists.

--HG--
branch : trunk

1 files changed, 2 insertions, 2 deletions

diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp
index 0fdd25ebfe7..b6d6f90d2a4 100644
--- a/src/bindings/scripts/include/sc_creature.cpp
+++ b/src/bindings/scripts/include/sc_creature.cpp
@@ -476,12 +476,12 @@ void ScriptedAI::DoZoneInCombat(Unit* pUnit)
         return;
     }
 
-    /*if (!pUnit->CanHaveThreatList() || pUnit->getThreatManager().isThreatListEmpty())
+    if (!pUnit->CanHaveThreatList() || pUnit->getThreatManager().isThreatListEmpty())
     {
         error_log("SD2: DoZoneInCombat called for creature that either cannot have threat list or has empty threat list (pUnit entry = %d)", pUnit->GetTypeId() == TYPEID_UNIT ? ((Creature*)pUnit)->GetEntry() : 0);
 
         return;
-    }*/
+    }
 
     InstanceMap::PlayerList const &PlayerList = ((InstanceMap*)map)->GetPlayers();
     InstanceMap::PlayerList::const_iterator i;