aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/game/Player.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 6c52978fa42..6cb586b506a 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -481,7 +481,10 @@ Player::~Player ()
// it must be unloaded already in PlayerLogout and accessed only for loggined player
//m_social = NULL;
- assert (!FindMap());
+ // Player may still set map - remove it to correctly unload instances
+ if (FindMap())
+ ResetMap();
+
// Note: buy back item already deleted from DB when player was saved
for(uint8 i = 0; i < PLAYER_SLOTS_COUNT; ++i)