|
|
@ -1577,22 +1577,21 @@ public class ClientMessagePump implements NetMsgHandler { |
|
|
|
return; |
|
|
|
return; |
|
|
|
|
|
|
|
|
|
|
|
if (buy != null) { |
|
|
|
if (buy != null) { |
|
|
|
|
|
|
|
if(npc.getName().equals("Resource Merchant")) { |
|
|
|
|
|
|
|
MobLoot resource = new MobLoot(npc, ItemBase.getItemBase(buy.getItemBaseID()), 1, true); |
|
|
|
|
|
|
|
resource.setValue(Warehouse.getCostForResource(buy.getItemBaseID())); |
|
|
|
|
|
|
|
npc.getCharItemManager().addItemToInventory(resource); |
|
|
|
|
|
|
|
npc.getCharItemManager().updateInventory(resource, true); |
|
|
|
|
|
|
|
} |
|
|
|
msg.setItem(buy); |
|
|
|
msg.setItem(buy); |
|
|
|
//send the buy message back to update player
|
|
|
|
//send the buy message back to update player
|
|
|
|
// msg.setItemType(buy.getObjectType().ordinal());
|
|
|
|
// msg.setItemType(buy.getObjectType().ordinal());
|
|
|
|
// msg.setItemID(buy.getObjectUUID());
|
|
|
|
// msg.setItemID(buy.getObjectUUID());
|
|
|
|
Dispatch dispatch = Dispatch.borrow(sourcePlayer, msg); |
|
|
|
Dispatch dispatch = Dispatch.borrow(sourcePlayer, msg); |
|
|
|
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY); |
|
|
|
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY); |
|
|
|
if(npc.getName().equals("Resource Merchant")){ |
|
|
|
|
|
|
|
MobLoot resource = new MobLoot(npc,ItemBase.getItemBase(buy.getItemBaseID()), 1, true); |
|
|
|
|
|
|
|
resource.setValue(Warehouse.getCostForResource(buy.getItemBaseID())); |
|
|
|
|
|
|
|
npc.getCharItemManager().addItemToInventory(resource); |
|
|
|
|
|
|
|
npc.getCharItemManager().updateInventory(resource,true); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
itemMan.updateInventory(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
itemMan.updateInventory(); |
|
|
|
|
|
|
|
} |
|
|
|
} finally { |
|
|
|
} finally { |
|
|
|
origin.buyLock.unlock(); |
|
|
|
origin.buyLock.unlock(); |
|
|
|
} |
|
|
|
} |
|
|
|