Conflicts: src/server/game/Accounts/AccountMgr.cpp src/server/game/Entities/Player/Player.h src/server/game/Server/WorldSocket.cpp src/server/game/World/World.cpp
Conflicts: src/server/game/Accounts/AccountMgr.cpp src/server/game/Entities/Player/Player.h src/server/game/Server/WorldSocket.cpp src/server/game/World/World.cpp