From 512aba5cd967fddee77b7ddd9145dc20ede0ef02 Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Thu, 14 Mar 2024 21:47:27 -0500 Subject: [PATCH] resource dupe --- src/engine/net/client/ClientMessagePump.java | 29 +++++--------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/src/engine/net/client/ClientMessagePump.java b/src/engine/net/client/ClientMessagePump.java index 45095cbb..069e7b1b 100644 --- a/src/engine/net/client/ClientMessagePump.java +++ b/src/engine/net/client/ClientMessagePump.java @@ -1408,7 +1408,7 @@ public class ClientMessagePump implements NetMsgHandler { } int cost = me.getMagicValue(); int resourceCost = Warehouse.getCostForResource(me.getItemBase().getUUID()); - if(resourceCost != 0) + if (resourceCost != 0) cost = resourceCost; float bargain = sourcePlayer.getBargain(); @@ -1440,29 +1440,14 @@ public class ClientMessagePump implements NetMsgHandler { if (!itemMan.buyFromNPC(b, cost, buildingDeposit)) { // chatMan.chatSystemInfo(pc, "" + "You Failed to buy the item."); - ChatManager.chatSystemError(sourcePlayer,"Failed To Buy Item"); + ChatManager.chatSystemError(sourcePlayer, "Failed To Buy Item"); return; } - - if(ib.getType().ordinal() == Enum.ItemType.RESOURCE.ordinal()) { - int count = 1; - for(Item item : itemMan.getInventory()){ - if(item.getItemBaseID() == ib.getUUID()){ - if(item.getNumOfItems() + count <= Warehouse.getMaxResources().get(ib.getUUID())){ - count += item.getNumOfItems(); - itemMan.delete(item); - } - } - } - Item resource = new MobLoot(sourcePlayer,ib,count,false).promoteToItem(sourcePlayer); - itemMan.addItemToInventory(resource); - }else { - buy = Item.createItemForPlayer(sourcePlayer, ib); - if (buy != null) { - me.transferEnchants(buy); - itemMan.addItemToInventory(buy); - //itemMan.updateInventory(); - } + buy = Item.createItemForPlayer(sourcePlayer, ib); + if (buy != null) { + me.transferEnchants(buy); + itemMan.addItemToInventory(buy); + //itemMan.updateInventory(); } } }