diff options
| author | jackpoz <giacomopoz@gmail.com> | 2014-12-21 20:26:46 +0100 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2014-12-21 20:26:46 +0100 |
| commit | 1bb2bdfe6d9b01a1d50b95ab8dcf4aefb607a61c (patch) | |
| tree | 08ffb07b1ba1ac5d52515caf47d79f987494f6ad /src/server/game/Handlers/TradeHandler.cpp | |
| parent | 1b9aca10c798c1665e89f339629b73f841c72535 (diff) | |
| parent | 3ee2f0d2bf9d5f859c8022ca49f1889c35584ffe (diff) | |
Merge PR https://github.com/TrinityCore/TrinityCore/pull/13702 into 3.3.5
Core/RBAC: Add two side trade to RBAC
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 4b032199604..8949b161e7b 100644 --- a/src/server/game/Handlers/TradeHandler.cpp +++ b/src/server/game/Handlers/TradeHandler.cpp @@ -676,7 +676,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); |