(cherry picked from commit aaaa1c34410c160c7b0382f5ecdb39fa01ba007c)
(cherry picked from commit 4a36850167)
Conflicts:
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/World/World.cpp
(cherry picked from commit aaaa1c34410c160c7b0382f5ecdb39fa01ba007c)
(cherry picked from commit 4a36850167)
Conflicts:
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/World/World.cpp