Updated to https://github.com/TrinityCore/TrinityCore/commit/805be8ebba07c3280089a128f1764d49f6f84ab6

With minor changes