Refactor warehouse part two.

src/engine/devcmd/cmds/RemoveObjectCmd.java

@@ -13,7 +13,10 @@ import engine.Enum.BuildingGroup;
 import engine.Enum.DbObjectType;
 import engine.InterestManagement.WorldGrid;
 import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.*;
+import engine.gameManager.BuildingManager;
+import engine.gameManager.ChatManager;
+import engine.gameManager.DbManager;
+import engine.gameManager.ZoneManager;
 import engine.math.Vector3fImmutable;
 import engine.objects.*;
 
@@ -128,10 +131,10 @@ public class RemoveObjectCmd extends AbstractDevCmd {
 
         if ((building.getBlueprint() != null) && (building.getBlueprint().getBuildingGroup() == BuildingGroup.WAREHOUSE)) {
             City city = City.getCity(building.getParentZone().playerCityUUID);
-            if (city != null) {
-                city.setWarehouseBuildingID(0);
-            }
-            Warehouse.warehouseByBuildingUUID.remove(building.getObjectUUID());
+
+            if (city != null)
+                city.warehouse = null;
+
         }
 
         //remove cached shrines.