diff options
| author | megamage <none@none> | 2009-04-04 15:12:36 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-04-04 15:12:36 -0600 |
| commit | f744c0907514a48425df8c96bffaadbe54ac3e79 (patch) | |
| tree | c5b3e53bd84f86d4b2e91170c7697b91ed50d35f /src/game/Creature.cpp | |
| parent | 6e00dd978970bbad082102fef34fe71f02a63a52 (diff) | |
| parent | 86bd3bfb422a299d6e0aac0f196ba4fea9affbc4 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Creature.cpp')
| -rw-r--r-- | src/game/Creature.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 049218cca86..69e371d323e 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -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); |