mirror of
https://github.com/araxiaonline/TrinityCore.git
synced 2026-06-18 06:00:10 -04:00
354e46d9e0
Conflicts: src/server/game/Entities/Player/Player.cpp src/server/game/Handlers/BattleGroundHandler.cpp src/server/game/Server/WorldSession.h src/server/game/Spells/Spell.cpp src/tools/vmap4_extractor/mpq_libmpq04.h