diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-09-08 00:08:49 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-09-08 00:08:49 +0200 |
| commit | 8aba20ce3a46443d5dada180a6ef9436ea4f7d4d (patch) | |
| tree | 35ebee7d1f5d65a419320ab12d1bb27c7eb383d1 /src/server/game/Handlers/TradeHandler.cpp | |
| parent | 8a8ab0b4b681b45189330c1e5c382aa6fb968aa4 (diff) | |
Core/Misc: Updated SpellCastResult, TradeStatus, InventoryResult and defined PlayerFlagsEx
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 32ed156b226..678b2b72120 100644 --- a/src/server/game/Handlers/TradeHandler.cpp +++ b/src/server/game/Handlers/TradeHandler.cpp @@ -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))) { |