aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKingPin <none@none>2009-01-15 21:59:40 -0500
committerKingPin <none@none>2009-01-15 21:59:40 -0500
commita48321f34805153d1dfe462e3950c63299ea4184 (patch)
tree290e0732291bd751a540a5be5e22bcee3b19bc55 /src
parent2d654fdc413cf769e65415f0e4cab50a63642ca1 (diff)
minor fix to Crossfaction trading patch originally by fgenesis, submitted for inclusion by Biglad.
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/TradeHandler.cpp2
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;