(cherry picked from commit a31bc08e441154efd7b76272dfae878794869650) Conflicts: src/server/game/Entities/Pet/Pet.cpp