mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-18 16:38:42 +01:00
(cherry picked from commit 7d9843c380)
Conflicts:
src/server/bnetserver/Packets/ConnectionPackets.h
src/server/game/AI/SmartScripts/SmartAI.h
src/server/game/Battlefield/Battlefield.h
src/server/game/Battlegrounds/Battleground.h
src/server/game/Entities/Object/Object.h
src/server/game/Entities/Player/Player.h
src/server/game/Guilds/Guild.h
src/server/game/Instances/InstanceSaveMgr.h
src/server/game/Support/SupportMgr.h