[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
This commit is contained in:
Seline
2008-10-26 13:58:39 -05:00
parent a0f843a3eb
commit 5faa23accc
+2 -2
View File
@@ -476,12 +476,12 @@ void ScriptedAI::DoZoneInCombat(Unit* pUnit)
return; 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); 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; return;
}*/ }
InstanceMap::PlayerList const &PlayerList = ((InstanceMap*)map)->GetPlayers(); InstanceMap::PlayerList const &PlayerList = ((InstanceMap*)map)->GetPlayers();
InstanceMap::PlayerList::const_iterator i; InstanceMap::PlayerList::const_iterator i;