mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-22 18:15:31 +01:00
*Merge.
--HG-- branch : trunk
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user