diff options
| author | et65 <et65@ashbringer.fr> | 2014-12-28 19:50:19 +0100 |
|---|---|---|
| committer | et65 <et65@ashbringer.fr> | 2014-12-28 19:50:19 +0100 |
| commit | e46921748d9173f0dcaa32f8a53626c21cf4a2a2 (patch) | |
| tree | e9467c092c4c9189b34ac10e95bc684c7d77ce3e /src/server/game/Handlers/TradeHandler.cpp | |
| parent | 4f557347ce26dcb3d7ce697ecd203ff92da5198a (diff) | |
| parent | 27137ca06e99209bd1a47a0ff7082ff14fcae8c9 (diff) | |
Merge remote-tracking branch 'trinitycore/6.x' into 6.x
Diffstat (limited to 'src/server/game/Handlers/TradeHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/TradeHandler.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/game/Handlers/TradeHandler.cpp b/src/server/game/Handlers/TradeHandler.cpp index dd5563e7a52..aa4579508f2 100644 --- a/src/server/game/Handlers/TradeHandler.cpp +++ b/src/server/game/Handlers/TradeHandler.cpp @@ -773,7 +773,9 @@ void WorldSession::HandleInitiateTradeOpcode(WorldPacket& recvPacket) return; } - if (!sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_TRADE) && pOther->GetTeam() !=_player->GetTeam()) + if (pOther->GetTeam() != _player->GetTeam() && + (!sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_TRADE) && + !GetPlayer()->GetSession()->HasPermission(rbac::RBAC_PERM_ALLOW_TWO_SIDE_TRADE))) { info.Status = TRADE_STATUS_WRONG_FACTION; SendTradeStatus(info); |