*Do not check formation for pet and summoned creatures.

--HG--
branch : trunk

1 files changed, 4 insertions, 1 deletions

diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 19d23162873..471934f4f80 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -199,9 +199,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);