Refactor warehouse part two.

src/engine/net/client/handlers/ArcViewAssetTransactionsMsgHandler.java

@@ -2,12 +2,15 @@ package engine.net.client.handlers;
 
 import engine.Enum;
 import engine.exception.MsgSendException;
+import engine.gameManager.BuildingManager;
 import engine.gameManager.SessionManager;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ArcViewAssetTransactionsMsg;
 import engine.net.client.msg.ClientNetMsg;
+import engine.objects.Building;
+import engine.objects.City;
 import engine.objects.PlayerCharacter;
 import engine.objects.Warehouse;
 
@@ -37,7 +40,13 @@ public class ArcViewAssetTransactionsMsgHandler extends AbstractClientMsgHandler
 
         msg = (ArcViewAssetTransactionsMsg) baseMsg;
 
-        Warehouse warehouse = Warehouse.warehouseByBuildingUUID.get(msg.getWarehouseID());
+        Building warehouseBuilding = BuildingManager.getBuilding(msg.getWarehouseID());
+        City city = warehouseBuilding.getCity();
+
+        if (city == null)
+            return true;
+
+        Warehouse warehouse = city.warehouse;
 
         if (warehouse == null)
             return true;

src/engine/net/client/handlers/ManageCityAssetMsgHandler.java

@@ -166,7 +166,12 @@ public class ManageCityAssetMsgHandler extends AbstractClientMsgHandler {
                                     return true;
                                 }
 
-                                Warehouse warehouse = Warehouse.warehouseByBuildingUUID.get(building.getObjectUUID());
+                                City city = building.getCity();
+
+                                if (city == null)
+                                    return true;
+
+                                Warehouse warehouse = city.warehouse;
 
                                 if (warehouse == null)
                                     return true;

src/engine/net/client/handlers/PlaceAssetMsgHandler.java

@@ -529,7 +529,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
         if (validateCityBuildingPlacement(serverZone, msg, origin, player, buildingList) == false)
             return false;
 
-        if (cityObject.getWarehouse() != null) {
+        if (cityObject.warehouse != null) {
             PlaceAssetMsg.sendPlaceAssetError(origin, 50, "");  //"You can only have one warehouse"
             return false;
         }

src/engine/net/client/handlers/TaxCityMsgHandler.java

@@ -41,7 +41,7 @@ public class TaxCityMsgHandler extends AbstractClientMsgHandler {
             return true;
         }
 
-        if (city.getWarehouse() == null) {
+        if (city.warehouse == null) {
             ErrorPopupMsg.sendErrorMsg(player, "This city does not have a warehouse!");
             return true;
         }
@@ -57,7 +57,7 @@ public class TaxCityMsgHandler extends AbstractClientMsgHandler {
             return true;
         }
 
-        if (playerGuild.getOwnedCity().getWarehouse() == null) {
+        if (playerGuild.getOwnedCity().warehouse == null) {
             ErrorPopupMsg.sendErrorMsg(player, "Your Guild needs to own a warehouse!");
             return true;
         }
@@ -111,7 +111,7 @@ public class TaxCityMsgHandler extends AbstractClientMsgHandler {
 
         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, msg);
         DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);

src/engine/net/client/msg/ViewResourcesMessage.java

@@ -78,7 +78,7 @@ public class ViewResourcesMessage extends ClientNetMsg {
         if (this.city == null)
             return false;
 
-        this.warehouseObject = this.city.getWarehouse();
+        this.warehouseObject = this.city.warehouse;
 
         return this.warehouseObject != null;
     }