From b3939b91deda8081c5b144109829599b05e81272 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Thu, 17 Sep 2009 11:21:23 -0600
Subject: Prevent trading with other players who are shoping

---
 src/map/trade.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/map/trade.c b/src/map/trade.c
index 31f29ce..9e99ef1 100644
--- a/src/map/trade.c
+++ b/src/map/trade.c
@@ -28,7 +28,7 @@ void trade_traderequest(struct map_session_data *sd,int target_id)
 				return;
 			}
 		}
-		if (target_sd->npc_id)
+		if (target_sd->npc_id || target_sd->npc_shopid)
 		{
 			//Trade fails if you are using an NPC.
 			clif_tradestart(sd, 2);
-- 
cgit v1.2.3-70-g09d2