Conflicts: src/server/game/Achievements/AchievementMgr.cpp src/server/game/Handlers/CharacterHandler.cpp src/server/game/World/World.cpp src/server/game/World/World.h
Conflicts: src/server/game/Achievements/AchievementMgr.cpp src/server/game/Handlers/CharacterHandler.cpp src/server/game/World/World.cpp src/server/game/World/World.h