Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Merge PR https://github.com/TrinityCore/TrinityCore/pull/13702 into 3.3.5

Browse Source 
Core/RBAC: Add two side trade to RBAC
This commit is contained in:
jackpoz committed 2014-12-21 20:26:46 +01:00
2 parents 1b9aca10c7 3ee2f0d2bf
commit 1bb2bdfe6d
3 files changed
+13 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/Handlers/TradeHandler.cpp
+3 -1
View File
@@ -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);