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

resource stacking bug

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-03-09 19:52:52 -06:00
parent 8d32927241
commit c1440f8f9e
1 changed files with 2 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/CharacterItemManager.java
+2 -36
View File
@@ -640,7 +640,6 @@ public class CharacterItemManager {
dispatch = Dispatch.borrow(other, utwm);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.PRIMARY);
stripTempEnchants(i);
this.updateInventory();
return true;
}
@@ -1057,7 +1056,6 @@ public class CharacterItemManager {
calculateWeights();
stripTempEnchants(i);
this.updateInventory();
return true;
}
@@ -1203,7 +1201,6 @@ public class CharacterItemManager {
calculateWeights();
stripTempEnchants(i);
this.updateInventory();
return true;
}
@@ -1258,40 +1255,10 @@ public class CharacterItemManager {
return false;
}
if (i.getItemBase().getType().equals(ItemType.RESOURCE) && this.getOwner().getObjectType().equals(GameObjectType.PlayerCharacter)) {
boolean added = false;
ArrayList<Item> purge = new ArrayList<>();
int count = i.getNumOfItems();
for(Item item : this.inventory){
if(item.getItemBaseID() == i.getItemBaseID()){
purge.add(item);
if(count + item.getNumOfItems() <= Warehouse.maxResources.get(i.getItemBaseID())) {
count += item.getNumOfItems();
added = true;
purge.add(item);
}
}
}
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{
i.setNumOfItems(count);
for(Item item : purge){
this.removeItemFromInventory(item);
}
}
this.inventory.add(i);
this.itemIDtoType.put(i.getObjectUUID(), i.getObjectType().ordinal());
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;
}
@@ -2466,7 +2433,6 @@ public class CharacterItemManager {
calculateWeights();
stripTempEnchants(i);
this.updateInventory();
return true;
}