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

Refactor warehouse part two.

Browse Source
This commit is contained in:
MagicBot
2024-03-17 09:47:00 -04:00
parent b76a384e1f
commit f3bfdd8a36
15 changed files with 155 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/Building.java
+6 -6
View File
@@ -1426,21 +1426,21 @@ public class Building extends AbstractWorldObject {
if (this.getCity() == null)
return amount;
if (this.getCity().getWarehouse() == null)
if (this.getCity().warehouse == null)
return amount;
if (this.getCity().getWarehouse().resources.get(ResourceType.GOLD) >= ResourceType.GOLD.deposit_limit)
if (this.getCity().warehouse.resources.get(ResourceType.GOLD) >= ResourceType.GOLD.deposit_limit)
return amount;
int profitAmount = (int) (amount * (taxAmount * .01f));
if (this.getCity().getWarehouse().resources.get(ResourceType.GOLD) + profitAmount <= ResourceType.GOLD.deposit_limit) {
Warehouse.depositProfitTax(ResourceType.GOLD, profitAmount, this, this.getCity().getWarehouse());
if (this.getCity().warehouse.resources.get(ResourceType.GOLD) + profitAmount <= ResourceType.GOLD.deposit_limit) {
Warehouse.depositProfitTax(ResourceType.GOLD, profitAmount, this, this.getCity().warehouse);
return amount - profitAmount;
}
//overDrafting
int warehouseDeposit = ResourceType.GOLD.deposit_limit - this.getCity().getWarehouse().resources.get(ResourceType.GOLD);
Warehouse.depositProfitTax(ResourceType.GOLD, warehouseDeposit, this, this.getCity().getWarehouse());
int warehouseDeposit = ResourceType.GOLD.deposit_limit - this.getCity().warehouse.resources.get(ResourceType.GOLD);
Warehouse.depositProfitTax(ResourceType.GOLD, warehouseDeposit, this, this.getCity().warehouse);
return amount - warehouseDeposit;
}