aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormegamage <none@none>2008-12-30 21:06:26 -0600
committermegamage <none@none>2008-12-30 21:06:26 -0600
commit67ea3f3d0a48683323fa1e4e494cb2c11eacfebb (patch)
treeb397f11f19aded655b6a5120f5a6e8117128544e /src
parent12d4ce413e7b3b9d697b160bac6c918564b2fd1e (diff)
*A temp fix for the bug that summoned guardians cause crash.
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/Map.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 99474bfedf9..f8e5077d52f 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -257,7 +257,7 @@ template<>
void Map::AddToGrid(Creature* obj, NGridType *grid, Cell const& cell)
{
// add to world object registry in grid
- if(obj->isPet() || obj->isPossessedByPlayer())
+ if(obj->isPet() && IS_PLAYER_GUID(obj->GetOwnerGUID()) || obj->isPossessedByPlayer())
{
(*grid)(cell.CellX(), cell.CellY()).AddWorldObject<Creature>(obj, obj->GetGUID());
obj->SetCurrentCell(cell);