Core/Spells: Players with active pets count as if they were players in combat against spells with SPELL_ATTR1_CANT_TARGET_IN_COMBAT
Merge pull request #12084 from Trisjdc/pet_combat_2

Core/Spells: Players with active pets count as if they were players in combat against spells with SPELL_ATTR1_CANT_TARGET_IN_COMBAT
更新
更新
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into ghbb
Merge branch 'Transmogrification' of https://github.com/shenhuyong/TrinityCore into ghbb

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Scripting/ScriptLoader.cpp
	src/server/scripts/Custom/CMakeLists.txt
	src/server/scripts/Custom/Transmogrification.cpp
	src/server/scripts/Custom/Transmogrifier.cpp
	src/server/worldserver/worldserver.conf.dist
Merge branch 'Transmogrification' of https://github.com/shenhuyong/TrinityCore into ghbb

Conflicts:
	src/server/game/Scripting/ScriptLoader.cpp
	src/server/scripts/Custom/CMakeLists.txt
	src/server/scripts/Custom/Transmogrification.cpp
	src/server/scripts/Custom/Transmogrifier.cpp