aboutsummaryrefslogtreecommitdiff
path: root/src/game/WorldSession.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-03-08 13:05:56 -0600
committermegamage <none@none>2009-03-08 13:05:56 -0600
commit328345ac1ab328fb382ec40ba6f5fa95b43a72c4 (patch)
tree7df78db6c5639339cc85b38c36903931dc4730ce /src/game/WorldSession.cpp
parent56416558fadae5fa160c34280760c5c9883c68f2 (diff)
[7403] much more unneeded includes removed Author: balrok
--HG-- branch : trunk
Diffstat (limited to 'src/game/WorldSession.cpp')
-rw-r--r--src/game/WorldSession.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/game/WorldSession.cpp b/src/game/WorldSession.cpp
index 70a864229ea..8e7c2595923 100644
--- a/src/game/WorldSession.cpp
+++ b/src/game/WorldSession.cpp
@@ -22,12 +22,11 @@
\ingroup u2w
*/
-#include "WorldSocket.h"
+#include "WorldSocket.h" // must be first to make ACE happy with ACE includes in it
#include "Common.h"
#include "Database/DatabaseEnv.h"
#include "Log.h"
#include "Opcodes.h"
-#include "WorldSocket.h"
#include "WorldPacket.h"
#include "WorldSession.h"
#include "Player.h"
@@ -35,12 +34,10 @@
#include "Group.h"
#include "Guild.h"
#include "World.h"
-#include "MapManager.h"
#include "ObjectAccessor.h"
#include "BattleGroundMgr.h"
#include "OutdoorPvPMgr.h"
-#include "Language.h" // for CMSG_CANCEL_MOUNT_AURA handler
-#include "Chat.h"
+//#include "Language.h" // for CMSG_CANCEL_MOUNT_AURA handler
#include "SocialMgr.h"
/// WorldSession constructor
@@ -377,7 +374,7 @@ void WorldSession::LogoutPlayer(bool Save)
// 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
- if(_player->IsInWorld()) MapManager::Instance().GetMap(_player->GetMapId(), _player)->Remove(_player, false);
+ if(_player->IsInWorld()) _player->GetMap()->Remove(_player, false);
// RemoveFromWorld does cleanup that requires the player to be in the accessor
ObjectAccessor::Instance().RemoveObject(_player);