(cherry picked from commit 59e9bcf0bf44d89397f5a182e2ef21f7e3a3635d) Conflicts: src/server/game/Server/WorldSocket.cpp