From 67136ff0decf4e571ebea7b6d2abd99bede26fdd Mon Sep 17 00:00:00 2001
From: Tacef Ine <tacef@projectswg.com>
Date: Fri, 14 Jul 2017 18:52:57 +0200
Subject: [PATCH] Change the handling of Notrade and equipped Items for Trading

---
 src/services/trade/TradeService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/services/trade/TradeService.java b/src/services/trade/TradeService.java
index bb8858bd1..27428b6a8 100644
--- a/src/services/trade/TradeService.java
+++ b/src/services/trade/TradeService.java
@@ -171,13 +171,13 @@ public class TradeService extends Service {
 		
 		SWGObject tradeObject = objectManager.getObjectById(packet.getObjectId());
 		if(creature.hasSlottedObject(tradeObject)){
+			tradeSession.sendAbortTrade();
 			return;
 		}			
 		
 		if(tradeObject.hasAttribute("no_trade")){
 			sendSystemMessage(player, "add_item_failed_prose");
-			tradeSession.sendToPartner(creature, new RemoveItemMessage(packet.getObjectId()));
-			tradeSession.removeFromItemList(creature, packet.getObjectId());
+			tradeSession.sendAbortTrade();
 		}
 		
 		tradeObject.setContainerPermissions(ContainerPermissionsType.INVENTORY);