Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

resource stacking update

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-02-19 18:39:02 -06:00
parent be902cf09c
commit 84a75f6b83
2 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/CharacterItemManager.java
+13 -24
View File
@@ -1244,34 +1244,23 @@ public class CharacterItemManager {
return false;
}
this.inventory.add(i);
this.itemIDtoType.put(i.getObjectUUID(), i.getObjectType().ordinal());
ItemBase ib = i.getItemBase();
if (ib != null)
this.inventoryWeight += ib.getWeight();
if (i.getItemBase().getType().equals(ItemType.RESOURCE) && this.getOwner().getObjectType().equals(GameObjectType.PlayerCharacter)) {
int count = i.getNumOfItems();
ArrayList<Item> purge = new ArrayList<>();
for (Item it : this.getInventory()) {
if (it.getItemBase().equals(i.getItemBase()) && it.getNumOfItems() + i.getNumOfItems() <= Warehouse.getMaxResources().get(it.getItemBaseID())) {
purge.add(it);
count += it.getNumOfItems();
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();
}
}
}
if (count <= Warehouse.getMaxResources().get(i.getItemBaseID())) {
MobLoot ml = new MobLoot(this.getOwner(), i.getItemBase(), count, false);
for (Item p : purge) {
this.removeItemFromInventory(p);
}
this.addItemToInventory(ml.promoteToItem((PlayerCharacter) this.getOwner()), 1);
this.updateInventory(ml.promoteToItem((PlayerCharacter) this.getOwner()),true);
return true;
}
}
}else {
this.inventory.add(i);
this.itemIDtoType.put(i.getObjectUUID(), i.getObjectType().ordinal());
ItemBase ib = i.getItemBase();
if (ib != null)
this.inventoryWeight += ib.getWeight();
}
return true;
}