Refactor itembase.name to template.

2024-02-28 16:31:09 -05:00
parent 507769c6b6
commit d9775dbf4e
17 changed files with 131 additions and 90 deletions
@@ -1381,10 +1381,14 @@ public class City extends AbstractWorldObject {

        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 " + ib.getName() + " already!");
+                ErrorPopupMsg.sendErrorMsg(player, "You're warehouse has enough " + template.item_base_name + " already!");
                return true;
            }