From a48321f34805153d1dfe462e3950c63299ea4184 Mon Sep 17 00:00:00 2001
From: KingPin <none@none>
Date: Thu, 15 Jan 2009 21:59:40 -0500
Subject: minor fix to Crossfaction trading patch originally by fgenesis,
 submitted for inclusion by Biglad.

--HG--
branch : trunk
---
 src/game/TradeHandler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/game/TradeHandler.cpp')

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;
-- 
cgit v1.2.3