projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-05 20:12:51 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Browse Source
This commit is contained in:
Wefi
2013-09-14 16:06:18 -05:00
parent 0f460744ce 72f93a6eef
commit 17fca5249a
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/trade/TradeService.java
+10 -4
View File
@@ -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();
}