*Update to Mangos 6982.

--HG--
branch : trunk

1 files changed, 1 insertions, 1 deletions

diff --git a/src/game/Object.h b/src/game/Object.h
index 6b98f50bc65..f943d0f3d21 100644
--- a/src/game/Object.h
+++ b/src/game/Object.h
@@ -428,7 +428,7 @@ class TRINITY_DLL_SPEC WorldObject : public Object
         float GetDistance2d(const WorldObject* obj) const;
         float GetDistance2d(const float x, const float y) const;
         float GetDistanceZ(const WorldObject* obj) const;
-        bool IsInMap(const WorldObject* obj) const { return GetMapId()==obj->GetMapId() && GetInstanceId()==obj->GetInstanceId(); }
+        bool IsInMap(const WorldObject* obj) const { return IsInWorld() && obj->IsInWorld() && GetMapId()==obj->GetMapId() && GetInstanceId()==obj->GetInstanceId(); }
         bool IsWithinDistInMap(const WorldObject* obj, const float dist2compare, const bool is3D = true) const;
         bool IsWithinLOS(const float x, const float y, const float z ) const;
         bool IsWithinLOSInMap(const WorldObject* obj) const;