2 files changed, 7 insertions, 1 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 8cd21e1ef48..cc36be390d7 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -21398,3 +21398,9 @@ void Player::ResetMap()
     Unit::ResetMap();
     GetMapRef().unlink();
 }
+
+void SetMap(Map * map)
+{
+    Unit::SetMap(map);
+    m_mapRef.link(map, this);
+}
diff --git a/src/game/Player.h b/src/game/Player.h
index d6d512a73a0..fa9e48e4e01 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); assert (!m_currMap); m_mapRef.link(map, this);}
+        void SetMap(Map * map);
         void ResetMap();
 
         bool isAllowedToLoot(Creature* creature);