*Remove unneeded assert.

--HG--
branch : trunk

2 files changed, 1 insertions, 2 deletions

diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index 8a9a3e09be5..69a286289b3 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -1691,7 +1691,6 @@ void WorldObject::SendObjectDeSpawnAnim(uint64 guid)
 
 void WorldObject::SetMap(Map * map)
 {
-    assert (!m_currMap);
     ASSERT(map);
     m_currMap = map;
 }
diff --git a/src/game/Player.h b/src/game/Player.h
index c8fbe96049f..d6d512a73a0 100644
--- a/src/game/Player.h
+++ b/src/game/Player.h
@@ -2123,7 +2123,7 @@ class TRINITY_DLL_SPEC Player : public Unit
         MapReference &GetMapRef() { return m_mapRef; }
 
         // Set map to player and add reference
-        void SetMap(Map * map) {Unit::SetMap(map); m_mapRef.link(map, this);}
+        void SetMap(Map * map) {Unit::SetMap(map); assert (!m_currMap); m_mapRef.link(map, this);}
         void ResetMap();
 
         bool isAllowedToLoot(Creature* creature);