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);