Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: Updated SpellCastResult, TradeStatus, InventoryResult and defined PlayerFlagsEx

Browse Source
This commit is contained in:
Shauren
2015-09-08 00:08:49 +02:00
parent 8a8ab0b4b6
commit 8aba20ce3a
4 changed files with 113 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/game/Handlers/TradeHandler.cpp
View File

@@ -651,7 +651,9 @@ void WorldSession::HandleInitiateTradeOpcode(WorldPackets::Trade::InitiateTrade&
return;
}
if (pOther->GetTeam() != _player->GetTeam() &&
if ((pOther->GetTeam() != _player->GetTeam() ||
pOther->HasFlag(PLAYER_FLAGS_EX, PLAYER_FLAGS_EX_MERCENARY_MODE) ||
_player->HasFlag(PLAYER_FLAGS_EX, PLAYER_FLAGS_EX_MERCENARY_MODE)) &&
(!sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_TRADE) &&
!HasPermission(rbac::RBAC_PERM_ALLOW_TWO_SIDE_TRADE)))
{