mirror of
https://github.com/araxiaonline/TrinityCore.git
synced 2026-06-17 21:50:50 -04:00
1438c841ed
(cherry picked from commit 2d7d6f505c)
Conflicts:
src/server/game/Entities/Item/Item.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Handlers/TradeHandler.cpp
src/server/game/Spells/Spell.cpp