From 72f93a6eef03facc82ed8d414336f9c99fee75d5 Mon Sep 17 00:00:00 2001 From: Light2 Date: Sat, 14 Sep 2013 22:37:06 +0200 Subject: [PATCH] Fixed trading --- src/services/trade/TradeService.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/services/trade/TradeService.java b/src/services/trade/TradeService.java index 95bc6e5f..06100d90 100644 --- a/src/services/trade/TradeService.java +++ b/src/services/trade/TradeService.java @@ -23,6 +23,8 @@ import protocol.swg.objectControllerObjects.SecureTrade; import resources.common.ObjControllerOpcodes; import resources.objects.creature.CreatureObject; import engine.clients.Client; +import engine.resources.container.AllPermissions; +import engine.resources.container.CreatureContainerPermissions; import engine.resources.objects.SWGObject; import engine.resources.service.INetworkDispatch; import engine.resources.service.INetworkRemoteEvent; @@ -370,11 +372,15 @@ public class TradeService implements INetworkDispatch{ { cleanTradeSession(client, tradePartner.getClient()); } - //actingTraderInventory.transferTo(tradePartner, tradePartnerInventory, tradeObject); + actingTraderInventory.setContainerPermissions(AllPermissions.ALL_PERMISSIONS); + tradePartnerInventory.setContainerPermissions(AllPermissions.ALL_PERMISSIONS); + actingTraderInventory.transferTo(tradePartner, tradePartnerInventory, tradeObject); + actingTraderInventory.setContainerPermissions(CreatureContainerPermissions.CREATURE_CONTAINER_PERMISSIONS); + tradePartnerInventory.setContainerPermissions(CreatureContainerPermissions.CREATURE_CONTAINER_PERMISSIONS); - actingTraderInventory._remove(tradeObject); - actingTrader.makeUnaware(tradeObject); - tradePartnerInventory.add(tradeObject); + //actingTraderInventory._remove(tradeObject); + //actingTrader.makeUnaware(tradeObject); + //tradePartnerInventory.add(tradeObject); itr.remove(); }