// Kick a player out of the World
void WorldSession::KickPlayer()
{
      if (m_Socket)
          m_Socket->CloseSocket();
}

// WorldSession destructor
WorldSession::~WorldSession()
{
     // unload player if not unloaded
     if (_player)
         LogoutPlayer(true);

     // If have unclosed socket, close it
     if (m_Socket)
     {
         m_Socket->CloseSocket();
         m_Socket->RemoveReference();
         m_Socket = NULL;
     }

     if (m_Warden)
         delete m_Warden;

     // empty incoming packet queue
     WorldPacket* packet;
     while (_recvQueue.next(packet))
         delete packet;

     LoginDatabase.PExecute("UPDATE account SET active_realm_id = 0 WHERE id = %u;", GetAccountId());
     CharacterDatabase.PExecute("UPDATE characters SET online = 0 WHERE account = %u;", GetAccountId());
}

// unload player if not unloaded
     if (_player && !_player->isInCombat())
         LogoutPlayer(true);

// Log the player out
void WorldSession::LogoutPlayer(bool Save)
{
     // finish pending transfers before starting the logout
     while (_player && _player->IsBeingTeleportedFar())
         HandleMoveWorldportAckOpcode();

     m_playerLogout = true;
     m_playerSave = Save;

     if (_player)
     {
         if (uint64 lguid = GetPlayer()->GetLootGUID())
             DoLootRelease(lguid);

         // If the player just died before logging out, make him appear as a ghost
         // FIXME: logout must be delayed in case lost connection with client in time of combat
         if (_player->GetDeathTimer())
         {
             _player->getHostileRefManager().deleteReferences();
             _player->BuildPlayerRepop();
             _player->RepopAtGraveyard();
         }
         else if (!_player->getAttackers().empty())
         {
             _player->CombatStop();
             _player->getHostileRefManager().setOnlineOfflineState(false);
             _player->RemoveAllAurasOnDeath();

             // build set of player who attack _player or who have pet attacking of _player
             std::set<Player*> aset;
             for (Unit::AttackerSet::const_iterator itr = _player->getAttackers().begin(); itr != _player->getAttackers().end(); ++itr)
             {
                 Unit* owner = (*itr)->GetOwner();           // including player controlled case
                 if (owner)
                 {
                     if (owner->GetTypeId() == TYPEID_PLAYER)
                         aset.insert(owner->ToPlayer());
                 }
                 else
                 if ((*itr)->GetTypeId() == TYPEID_PLAYER)
                     aset.insert((*itr)->ToPlayer());
             }

             _player->SetPvPDeath(!aset.empty());
             _player->KillPlayer();
             _player->BuildPlayerRepop();
             _player->RepopAtGraveyard();

             // give honor to all attackers from set like group case
             for (std::set<Player*>::const_iterator itr = aset.begin(); itr != aset.end(); ++itr)
                 (*itr)->RewardHonor(_player,aset.size());

             // give bg rewards and update counters like kill by first from attackers
             // this can't be called for all attackers.
             if (!aset.empty())
                 if (BattleGround *bg = _player->GetBattleGround())
                     bg->HandleKillPlayer(_player,*aset.begin());
         }
         else if (_player->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION))
         {
             // this will kill character by SPELL_AURA_SPIRIT_OF_REDEMPTION
             _player->RemoveSpellsCausingAura(SPELL_AURA_MOD_SHAPESHIFT);
             //_player->SetDeathPvP(*); set at SPELL_AURA_SPIRIT_OF_REDEMPTION apply time
             _player->KillPlayer();
             _player->BuildPlayerRepop();
             _player->RepopAtGraveyard();
         }
         //drop a flag if player is carrying it
         if (BattleGround *bg = _player->GetBattleGround())
             bg->EventPlayerLoggedOut(_player);

         // Teleport to home if the player is in an invalid instance
         if (!_player->m_InstanceValid && !_player->isGameMaster())
         {
             _player->TeleportToHomebind();
             //this is a bad place to call for far teleport because we need player to be in world for successful logout
             //maybe we should implement delayed far teleport logout?
         }

         // FG: finish pending transfers after starting the logout
         // this should fix players beeing able to logout and login back with full hp at death position
         while (_player->IsBeingTeleportedFar())
             HandleMoveWorldportAckOpcode();

         sOutdoorPvPMgr.HandlePlayerLeaveZone(_player,_player->GetZoneId());

         for (int i=0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; ++i)
         {
             if (int32 bgTypeId = _player->GetBattleGroundQueueId(i))
             {
                 _player->RemoveBattleGroundQueueId(bgTypeId);
                 sBattleGroundMgr.m_BattleGroundQueues[ bgTypeId ].RemovePlayer(_player->GetGUID(), true);
             }
         }

         // If the player is in a guild, update the guild roster and broadcast a logout message to other guild members
         if (Guild *guild = objmgr.GetGuildById(_player->GetGuildId()))
         {
             guild->LoadPlayerStatsByGuid(_player->GetGUID());
             guild->UpdateLogoutTime(_player->GetGUID());

             guild->BroadcastEvent(GE_SIGNED_OFF, _player->GetGUID(), _player->GetName());
         }

         // Remove pet
         _player->RemovePet(NULL, PET_SAVE_AS_CURRENT, true);

         // empty buyback items and save the player in the database
         // some save parts only correctly work in case player present in map/player_lists (pets, etc)
         if (Save)
         {
             uint32 eslot;
             for (int j = BUYBACK_SLOT_START; j < BUYBACK_SLOT_END; ++j)
             {
                 eslot = j - BUYBACK_SLOT_START;
                 _player->SetUInt64Value(PLAYER_FIELD_VENDORBUYBACK_SLOT_1 + (eslot * 2), 0);
                 _player->SetUInt32Value(PLAYER_FIELD_BUYBACK_PRICE_1 + eslot, 0);
                 _player->SetUInt32Value(PLAYER_FIELD_BUYBACK_TIMESTAMP_1 + eslot, 0);
             }
             _player->SaveToDB();
         }

         // Leave all channels before player delete...
         _player->CleanupChannels();

         // If the player is in a group (or invited), remove him. If the group if then only 1 person, disband the group.
         _player->UninviteFromGroup();

         // remove player from the group if he is:
         // a) in group; b) not in raid group; c) logging out normally (not being kicked or disconnected)
         if (_player->GetGroup() && !_player->GetGroup()->isRaidGroup() && m_Socket)
             _player->RemoveFromGroup();

         // Send update to group
         if (_player->GetGroup())
             _player->GetGroup()->SendUpdate();

         // Broadcast a logout message to the player's friends
         sSocialMgr.SendFriendStatus(_player, FRIEND_OFFLINE, _player->GetGUIDLow(), true);
         sSocialMgr.RemovePlayerSocial (_player->GetGUIDLow ());

         // 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
         // calls to GetMap in this case may cause crashes
         _player->CleanupsBeforeDelete();
         Map* _map = _player->GetMap();
         _map->Remove(_player, true);
         _player = NULL;                    // deleted in Remove call

         // Send the 'logout complete' packet to the client
         WorldPacket data(SMSG_LOGOUT_COMPLETE, 0);
         SendPacket(&data);

         // Since each account can only have one online character at any given time, ensure all characters for active account are marked as offline
         //No SQL injection as AccountId is uint32
         CharacterDatabase.PExecute("UPDATE characters SET online = 0 WHERE account = '%u'",
             GetAccountId());
         sLog.outDebug("SESSION: Sent SMSG_LOGOUT_COMPLETE Message");
     }

     //Hook for OnLogout Event
     sScriptMgr.OnLogout(_player);

     m_playerLogout = false;
     m_playerSave = false;
     m_playerRecentlyLogout = true;
     LogoutRequest(0);
}

diff -r af889f221f44 src/server/game/Server/WorldSession.cpp
--- a/src/server/game/Server/WorldSession.cpp    Sun Sep 23 13:33:58 2012 +0300
+++ b/src/server/game/Server/WorldSession.cpp    Wed Oct 03 12:55:49 2012 +0300
@@ -417,10 +417,6 @@
          }
          else if (!_player->getAttackers().empty())
          {
-            _player->CombatStop();
-            _player->getHostileRefManager().setOnlineOfflineState(false);
-            _player->RemoveAllAurasOnDeath();
-
              // build set of player who attack _player or who have pet attacking of _player
              std::set<Player*> aset;
              for (Unit::AttackerSet::const_iterator itr = _player->getAttackers().begin(); itr != _player->getAttackers().end(); ++itr)
@@ -432,11 +428,6 @@
                      aset.insert((Player*)(*itr));
              }
   
-            _player->SetPvPDeath(!aset.empty());
-            _player->KillPlayer();
-            _player->BuildPlayerRepop();
-            _player->RepopAtGraveyard();
-
              // give honor to all attackers from set like group case
              for (std::set<Player*>::const_iterator itr = aset.begin(); itr != aset.end(); ++itr)
                  (*itr)->RewardHonor(_player, aset.size());
@@ -446,6 +437,14 @@
              if (!aset.empty())
                  if (Battleground* bg = _player->GetBattleground())
                      bg->HandleKillPlayer(_player, *aset.begin());
+
+            _player->CombatStop();
+            _player->getHostileRefManager().setOnlineOfflineState(false);
+            _player->RemoveAllAurasOnDeath();
+            _player->SetPvPDeath(!aset.empty());
+            _player->KillPlayer();
+            _player->BuildPlayerRepop();
+            _player->RepopAtGraveyard();
          }
          else if (_player->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION))
          {