Refactor warehouse part two.

src/engine/objects/City.java

@@ -81,6 +81,7 @@ public class City extends AbstractWorldObject {
     private int warehouseBuildingID = 0;
     private boolean open = false;
     private String hash;
+    public Warehouse warehouse;
 
     /**
      * ResultSet Constructor
@@ -893,14 +894,6 @@ public class City extends AbstractWorldObject {
         }
     }
 
-    public Warehouse getWarehouse() {
-
-        if (this.warehouseBuildingID == 0)
-            return null;
-
-        return Warehouse.warehouseByBuildingUUID.get(this.warehouseBuildingID);
-    }
-
     public Realm getRealm() {
 
         return Realm.getRealm(this.realmID);
@@ -1355,10 +1348,10 @@ public class City extends AbstractWorldObject {
         if (msg.getResources().size() == 0)
             return true;
 
-        if (city.getWarehouse() == null)
+        if (city.warehouse == null)
             return true;
 
-        Warehouse ruledWarehouse = playerGuild.getOwnedCity().getWarehouse();
+        Warehouse ruledWarehouse = playerGuild.getOwnedCity().warehouse;
 
         if (ruledWarehouse == null)
             return true;
@@ -1374,7 +1367,7 @@ public class City extends AbstractWorldObject {
             resources.add(ResourceType.hashLookup.get(resourceHash));
 
         for (ResourceType resourceType : resources) {
-            if (Warehouse.isAboveCap(ruledWarehouse, resourceType, (int) (city.getWarehouse().resources.get(resourceType) * taxPercent))) {
+            if (Warehouse.isAboveCap(ruledWarehouse, resourceType, (int) (city.warehouse.resources.get(resourceType) * taxPercent))) {
                 ErrorPopupMsg.sendErrorMsg(player, "Your warehouse has enough " + resourceType.name() + " already!");
                 return true;
             }
@@ -1387,7 +1380,7 @@ public class City extends AbstractWorldObject {
         }
 
         try {
-            Warehouse.transferResources(city.getWarehouse(), player, msg, resources, taxPercent);
+            Warehouse.transferResources(city.warehouse, player, msg, resources, taxPercent);
         } catch (Exception e) {
             Logger.info(e.getMessage());
         }
@@ -1396,7 +1389,7 @@ public class City extends AbstractWorldObject {
 
         ViewResourcesMessage vrm = new ViewResourcesMessage(player);
         vrm.setGuild(building.getGuild());
-        vrm.setWarehouseBuilding(BuildingManager.getBuildingFromCache(building.getCity().getWarehouse().buildingUID));
+        vrm.setWarehouseBuilding(BuildingManager.getBuildingFromCache(building.getCity().warehouse.buildingUID));
         vrm.configure();
         Dispatch dispatch = Dispatch.borrow(player, vrm);
         DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);