resource stacking update

2024-02-19 18:41:47 -06:00
parent 84a75f6b83
commit 44cd8d0013
1 changed files with 10 additions and 0 deletions
@@ -1245,14 +1245,24 @@ public class CharacterItemManager {
                return false;
            }
        if (i.getItemBase().getType().equals(ItemType.RESOURCE) && this.getOwner().getObjectType().equals(GameObjectType.PlayerCharacter)) {
+            boolean added = false;
            for(Item item : this.getInventory()){
                if(item.getItemBaseID() == i.getItemBaseID()){
                    if(item.getNumOfItems() + i.getNumOfItems() <= Warehouse.getMaxResources().get(item.getItemBaseID())) {
                        item.setNumOfItems(item.getNumOfItems() + i.getNumOfItems());
                        updateInventory();
+                        added = true;
                    }
                }
            }
+            if(!added){
+                this.inventory.add(i);
+                this.itemIDtoType.put(i.getObjectUUID(), i.getObjectType().ordinal());
+
+                ItemBase ib = i.getItemBase();
+                if (ib != null)
+                    this.inventoryWeight += ib.getWeight();
+            }
        }else {
            this.inventory.add(i);
            this.itemIDtoType.put(i.getObjectUUID(), i.getObjectType().ordinal());