josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
raczman
2009-04-04 23:33:16 +02:00
parent 85df8e0582 96f2363b04
commit c4821eef7a
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Creature.cpp
+4 -1
View File
@@ -199,9 +199,12 @@ void Creature::RemoveFromWorld()
void Creature::SearchFormation() void Creature::SearchFormation()
{ {
if(isPet())
return;
uint32 lowguid = GetDBTableGUIDLow(); uint32 lowguid = GetDBTableGUIDLow();
if(CreatureGroupMap.find(lowguid) != CreatureGroupMap.end()) if(lowguid && CreatureGroupMap.find(lowguid) != CreatureGroupMap.end())
{ {
m_formationID = CreatureGroupMap[lowguid]->leaderGUID; m_formationID = CreatureGroupMap[lowguid]->leaderGUID;
formation_mgr.UpdateCreatureGroup(m_formationID, this); formation_mgr.UpdateCreatureGroup(m_formationID, this);
src/game/Map.cpp
+1 -1
View File
@@ -625,7 +625,7 @@ void Map::RelocationNotify()
for(std::vector<Unit*>::iterator iter = i_unitsToNotify.begin(); iter != i_unitsToNotify.end(); ++iter) for(std::vector<Unit*>::iterator iter = i_unitsToNotify.begin(); iter != i_unitsToNotify.end(); ++iter)
{ {
Unit *unit = *iter; Unit *unit = *iter;
if(!unit->IsInWorld() || unit->GetMapId() != GetId()) if(unit->m_Notified || !unit->IsInWorld() || unit->GetMapId() != GetId())
continue; continue;
unit->m_IsInNotifyList = false; unit->m_IsInNotifyList = false;