From 5faa23accce0ac45fe4b55fb841c0eb764c10f72 Mon Sep 17 00:00:00 2001 From: Seline Date: Sun, 26 Oct 2008 13:58:39 -0500 Subject: [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 --- src/bindings/scripts/include/sc_creature.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') 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; -- cgit v1.2.3