*Merge.

--HG-- branch : trunk
2009-04-04 15:12:36 -06:00
parent 6e00dd9789 86bd3bfb42
commit f744c09075
5 changed files with 50 additions and 41 deletions
@@ -193,9 +193,12 @@ void Creature::RemoveFromWorld()

 void Creature::SearchFormation()
 {
+    if(isPet())
+        return;
+
    uint32 lowguid = GetDBTableGUIDLow();

-    if(CreatureGroupMap.find(lowguid) != CreatureGroupMap.end())
+    if(lowguid && CreatureGroupMap.find(lowguid) != CreatureGroupMap.end())
    {
        m_formationID = CreatureGroupMap[lowguid]->leaderGUID;
        formation_mgr.UpdateCreatureGroup(m_formationID, this);