Warehosue cleanup

src/engine/objects/City.java

@@ -875,7 +875,7 @@ public class City extends AbstractWorldObject {
         if (this.warehouseBuildingID == 0)
             return null;
 
-        return Warehouse.warehouseByBuildingUUID.get(this.warehouseBuildingID);
+        return WarehouseManager.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 (ruledWarehouse.isAboveCap(ib, (int) (city.getWarehouse().getResources().get(ib) * taxPercent))) {
+            if (WarehouseManager.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 {
-            city.getWarehouse().transferResources(player, msg, resources, taxPercent, ruledWarehouse);
+            WarehouseManager.transferResources(city.getWarehouse(), player, msg, resources, taxPercent);
         } catch (Exception e) {
             Logger.info(e.getMessage());
         }
@@ -1380,7 +1380,7 @@ public class City extends AbstractWorldObject {
 
         ViewResourcesMessage vrm = new ViewResourcesMessage(player);
         vrm.setGuild(building.getGuild());
-        vrm.setWarehouseBuilding(BuildingManager.getBuildingFromCache(building.getCity().getWarehouse().getBuildingUID()));
+        vrm.setWarehouseBuilding(BuildingManager.getBuildingFromCache(building.getCity().getWarehouse().buildingUID));
         vrm.configure();
         Dispatch dispatch = Dispatch.borrow(player, vrm);
         DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);