diff options
| author | Yehonal <hw.2@hotmail.it> | 2016-06-26 19:22:35 +0200 |
|---|---|---|
| committer | Yehonal <hw.2@hotmail.it> | 2016-06-26 19:22:35 +0200 |
| commit | 52f305111ce2bb876eaea985d75ffcb744f583a5 (patch) | |
| tree | 6607d6eb3af13384f3cf5e6aafd362f244da49ea /src/server/game/Handlers/TradeHandler.cpp | |
| parent | 5bb70a86beab67958520b170c5008b82d0e36314 (diff) | |
importing changes from callmephil repo
a special thanks to him
Diffstat (limited to 'src/server/game/Handlers/TradeHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/TradeHandler.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Handlers/TradeHandler.cpp b/src/server/game/Handlers/TradeHandler.cpp index 1aa78e17d4..f043ccfa8c 100644 --- a/src/server/game/Handlers/TradeHandler.cpp +++ b/src/server/game/Handlers/TradeHandler.cpp @@ -618,11 +618,11 @@ void WorldSession::HandleInitiateTradeOpcode(WorldPacket& recvPacket) return; } - if (pOther->GetTeamId() !=_player->GetTeamId()) - { - SendTradeStatus(TRADE_STATUS_WRONG_FACTION); - return; - } + if (!sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_TRADE) && pOther->GetTeamId() != _player->GetTeamId()) + { + SendTradeStatus(TRADE_STATUS_WRONG_FACTION); + return; + } if (!pOther->IsWithinDistInMap(_player, 10.0f, false)) { |