class and table schema now conform to JSON

src/engine/gameManager/MovementManager.java

@@ -267,7 +267,7 @@ public enum MovementManager {
         Zone serverZone = null;
 
         serverZone = ZoneManager.findSmallestZone(player.getLoc());
-        cityObject = (City) DbManager.getFromCache(GameObjectType.City, serverZone.playerCityID);
+        cityObject = (City) DbManager.getFromCache(GameObjectType.City, serverZone.playerCityUUID);
 
         // Do not send group messages if player is on grid
 

src/engine/gameManager/ZoneManager.java

@@ -182,7 +182,7 @@ public enum ZoneManager {
 
     public static final void populateWorldZones(final Zone zone) {
 
-        int loadNum = zone.loadNum;
+        int loadNum = zone.zoneTemplate;
 
         // Zones are added to separate
         // collections for quick access
@@ -194,7 +194,7 @@ public enum ZoneManager {
         }
 
 
-        if (zone.isPlayerCity) {
+        if (zone.isGuildZone) {
             addPlayerCityZone(zone);
             return;
         }
@@ -214,7 +214,7 @@ public enum ZoneManager {
     }
 
     public static final void addPlayerCityZone(final Zone zone) {
-        zone.isPlayerCity = true;
+        zone.isGuildZone = true;
         ZoneManager.playerCityZones.add(zone);
     }
 
@@ -387,8 +387,8 @@ public enum ZoneManager {
 
         currentZone = ZoneManager.findSmallestZone(worldLoc);
 
-        if (currentZone.isPlayerCity)
-            return City.getCity(currentZone.playerCityID);
+        if (currentZone.isGuildZone)
+            return City.getCity(currentZone.playerCityUUID);
 
         return null;
     }
@@ -440,7 +440,7 @@ public enum ZoneManager {
 
 //not player city, must be npc city..
 
-            if (!zone.isPlayerCity)
+            if (!zone.isGuildZone)
                 zone.isNPCCity = true;
 
             if ((ConfigManager.serverType.equals(Enum.ServerType.WORLDSERVER)) && (city.getHash() == null)) {
@@ -469,7 +469,7 @@ public enum ZoneManager {
         // Children of seafloor
 
         if (parentZone.parent == null)
-            return worldAlttitude + zone.yCoord;
+            return worldAlttitude + zone.yOffset;
 
         // return height from heightmap engine at zone location
 
@@ -477,7 +477,7 @@ public enum ZoneManager {
 
         // Add zone offset to value
 
-        worldAlttitude += zone.yCoord;
+        worldAlttitude += zone.yOffset;
 
         return worldAlttitude;
     }