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

More refactor itembase out of warehouse

Browse Source
This commit is contained in:
MagicBot
2024-03-15 10:47:35 -04:00
parent 6ed4faded2
commit a489aecb86
2 changed files with 17 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/City.java
+6 -15
View File
@@ -1365,28 +1365,19 @@ public class City extends AbstractWorldObject {
ItemBase.getItemHashIDMap();
ArrayList<Integer> resources = new ArrayList<>();
ArrayList<ResourceType> resources = new ArrayList<>();
float taxPercent = msg.getTaxPercent();
if (taxPercent > 20)
taxPercent = .20f;
for (int resourceHash : msg.getResources().keySet()) {
if (ItemBase.getItemHashIDMap().get(resourceHash) != null)
resources.add(ItemBase.getItemHashIDMap().get(resourceHash));
}
for (int resourceHash : msg.getResources().keySet())
resources.add(ResourceType.hashLookup.get(resourceHash));
for (Integer itemBaseID : resources) {
ItemBase ib = ItemBase.getItemBase(itemBaseID);
if (ib == null)
continue;
ItemTemplate template = ItemTemplate.itemTemplates.get(itemBaseID);
if (Warehouse.isAboveCap(ruledWarehouse, ib, (int) (city.getWarehouse().resources.get(ib) * taxPercent))) {
ErrorPopupMsg.sendErrorMsg(player, "You're warehouse has enough " + template.item_base_name + " already!");
for (ResourceType resourceType : resources) {
if (Warehouse.isAboveCap(ruledWarehouse, resourceType, (int) (city.getWarehouse().resources.get(resourceType) * taxPercent))) {
ErrorPopupMsg.sendErrorMsg(player, "Your warehouse has enough " + resourceType.name() + " already!");
return true;
}