*Merge.

--HG--
branch : trunk

1 files changed, 8 insertions, 7 deletions

diff --git a/src/game/WorldSession.cpp b/src/game/WorldSession.cpp
index 231d7783d9e..78bc11f62e0 100644
--- a/src/game/WorldSession.cpp
+++ b/src/game/WorldSession.cpp
@@ -249,6 +249,14 @@ void WorldSession::LogoutPlayer(bool Save)
 
     if (_player)
     {
+        // Unpossess the current possessed unit of player
+        _player->StopCharmOrPossess();
+
+        // Remove any possession of this player on logout
+        _player->RemoveCharmedOrPossessedBy(NULL);
+
+        _player->DestroyForNearbyPlayers();
+
         if (uint64 lguid = GetPlayer()->GetLootGUID())
             DoLootRelease(lguid);
 
@@ -374,13 +382,6 @@ void WorldSession::LogoutPlayer(bool Save)
         if(_player->GetGroup() && !_player->GetGroup()->isRaidGroup() && m_Socket)
             _player->RemoveFromGroup();
 
-        // Unpossess the current possessed unit of player
-        if (_player->isPossessing())
-            _player->RemovePossess(false);
-
-        // Remove any possession of this player on logout
-        _player->UnpossessSelf(false);
-
         ///- Remove the player from the world
         // the player may not be in the world when logging out
         // e.g if he got disconnected during a transfer to another map