mirror of
https://github.com/araxiaonline/TrinityCore.git
synced 2026-06-14 20:22:23 -04:00
(cherry picked from commit 8e2634b2b4)
Conflicts:
src/server/bnetserver/Server/Session.cpp
src/server/bnetserver/Server/Session.h
src/server/database/Database/QueryCallback.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/SocialHandler.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Server/WorldSocket.cpp
src/server/game/Server/WorldSocket.h
src/server/game/World/World.cpp
src/server/game/World/World.h