diff options
| author | megamage <none@none> | 2009-01-16 14:32:47 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-01-16 14:32:47 -0600 |
| commit | 80263de422ad4e1cdb103eaec3a2acf74631f884 (patch) | |
| tree | b4da0d56676c397cd0ef5a83039e458f67ddd411 /src/game/TradeHandler.cpp | |
| parent | 40a1154c5befcfde3d584c71aa1d9a8b6cb1b638 (diff) | |
| parent | a8e7fb16493c05a25044c01c5b58ea08e485a97a (diff) | |
Update to Trinity 863.
--HG--
branch : trunk
Diffstat (limited to 'src/game/TradeHandler.cpp')
| -rw-r--r-- | src/game/TradeHandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/TradeHandler.cpp b/src/game/TradeHandler.cpp index 58a18896e9f..dc3bd020ccf 100644 --- a/src/game/TradeHandler.cpp +++ b/src/game/TradeHandler.cpp @@ -536,7 +536,7 @@ void WorldSession::HandleInitiateTradeOpcode(WorldPacket& recvPacket) return; } - if(pOther->GetTeam() !=_player->GetTeam() ) + if(!sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_TRADE) && pOther->GetTeam() !=_player->GetTeam() ) { SendTradeStatus(TRADE_STATUS_WRONG_FACTION); return; |