merchant resource stacking

2024-05-20 14:07:30 -05:00
parent b7ebb728e2
commit 2ca51d6a83
1 changed files with 31 additions and 5 deletions
@@ -1464,6 +1464,23 @@ public class ClientMessagePump implements NetMsgHandler {
                                ChatManager.chatSystemError(sourcePlayer, "Failed To Buy Item");
                                return;
                            }
+                            if(me.getItemBase().getType().equals(ItemType.RESOURCE)){
+                                boolean stacked = false;
+                                for(Item item : itemMan.getInventory()){
+                                    int itemID = item.getItemBaseID();
+                                    int meID = me.getItemBase().getUUID();
+                                    if(itemID == meID){
+                                        int maxStack = Warehouse.maxResources.get(meID);
+                                        if(maxStack > item.getNumOfItems() + 1){
+                                            item.setNumOfItems(item.getNumOfItems() + 1);
+                                            stacked = true;
+                                            itemMan.updateInventory();
+                                            item.updateDatabase();
+                                            break;
+                                        }
+                                    }
+                                }
+                                if(!stacked){
                                    buy = Item.createItemForPlayer(sourcePlayer, ib);
                                    if (buy != null) {
                                        me.transferEnchants(buy);
@@ -1471,6 +1488,15 @@ public class ClientMessagePump implements NetMsgHandler {
                                        //itemMan.updateInventory();
                                    }
                                }
+                            }else {
+                                buy = Item.createItemForPlayer(sourcePlayer, ib);
+                                if (buy != null) {
+                                    me.transferEnchants(buy);
+                                    itemMan.addItemToInventory(buy);
+                                    //itemMan.updateInventory();
+                                }
+                            }
+                        }
                    }
                } else if (msg.getItemType() == GameObjectType.Item.ordinal()) {