mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-19 08:55:32 +01:00
# Conflicts: # src/server/game/Entities/Creature/Creature.cpp # src/server/game/Entities/Object/Object.cpp # src/server/game/Maps/Map.cpp # src/server/game/Maps/Map.h