Warehosue cleanup
This commit is contained in:
@@ -875,7 +875,7 @@ public class City extends AbstractWorldObject {
|
||||
if (this.warehouseBuildingID == 0)
|
||||
return null;
|
||||
|
||||
return WarehouseManager.warehouseByBuildingUUID.get(this.warehouseBuildingID);
|
||||
return Warehouse.warehouseByBuildingUUID.get(this.warehouseBuildingID);
|
||||
}
|
||||
|
||||
public Realm getRealm() {
|
||||
@@ -1358,7 +1358,7 @@ public class City extends AbstractWorldObject {
|
||||
ItemBase ib = ItemBase.getItemBase(itemBaseID);
|
||||
if (ib == null)
|
||||
continue;
|
||||
if (WarehouseManager.isAboveCap(ruledWarehouse, ib, (int) (city.getWarehouse().resources.get(ib) * taxPercent))) {
|
||||
if (Warehouse.isAboveCap(ruledWarehouse, ib, (int) (city.getWarehouse().resources.get(ib) * taxPercent))) {
|
||||
ErrorPopupMsg.sendErrorMsg(player, "You're warehouse has enough " + ib.getName() + " already!");
|
||||
return true;
|
||||
}
|
||||
@@ -1371,7 +1371,7 @@ public class City extends AbstractWorldObject {
|
||||
}
|
||||
|
||||
try {
|
||||
WarehouseManager.transferResources(city.getWarehouse(), player, msg, resources, taxPercent);
|
||||
Warehouse.transferResources(city.getWarehouse(), player, msg, resources, taxPercent);
|
||||
} catch (Exception e) {
|
||||
Logger.info(e.getMessage());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user