class and table schema now conform to JSON

src/engine/objects/AbstractIntelligenceAgent.java

@@ -130,7 +130,7 @@ public abstract class AbstractIntelligenceAgent extends AbstractCharacter {
         ArrayList<Zone> allIn = ZoneManager.getAllZonesIn(this.getLoc());
 
         for (Zone zone : allIn)
-            if (zone.peaceZone == (byte) 1)
+            if (zone.peace_zone == (byte) 1)
                 return true;
 
         return false;

src/engine/objects/Bane.java

@@ -162,7 +162,7 @@ public final class Bane {
 
         // Cannot place assets on a dead tree
 
-        if ((cityZone.isGuildZone) &&
+        if ((cityZone.guild_zone) &&
                 (City.getCity(cityZone.playerCityUUID).getTOL().getRank() == -1)) {
             PlaceAssetMsg.sendPlaceAssetError(origin, 1, "Cannot bane a dead tree!");
             return false;

src/engine/objects/Building.java

@@ -460,7 +460,7 @@ public class Building extends AbstractWorldObject {
                 }
             }
         }
-        if (this.parentZone.isGuildZone == false)
+        if (this.parentZone.guild_zone == false)
             return null;
 
         return City.getCity(this.parentZone.playerCityUUID);

src/engine/objects/City.java

@@ -334,7 +334,7 @@ public class City extends AbstractWorldObject {
                 if (city.noTeleport)
                     continue;
 
-                if (city.parentZone != null && city.parentZone.isGuildZone) {
+                if (city.parentZone != null && city.parentZone.guild_zone) {
 
                     if (pc.getAccount().status.equals(AccountStatus.ADMIN)) {
                         cities.add(city);
@@ -395,7 +395,7 @@ public class City extends AbstractWorldObject {
                 if (city.noRepledge)
                     continue;
 
-                if (city.parentZone != null && city.parentZone.isGuildZone) {
+                if (city.parentZone != null && city.parentZone.guild_zone) {
 
                     //list Player cities
                     //open city, just list

src/engine/objects/NPC.java

@@ -894,7 +894,7 @@ public class NPC extends AbstractCharacter {
             this.stamina.set(this.staminaMax);
         }
 
-        if (this.parentZone.isGuildZone)
+        if (this.parentZone.guild_zone)
             if (NPC.GetNPCProfits(this) == null)
                 NPCProfits.CreateProfits(this);
 

src/engine/objects/PlayerCharacter.java

@@ -1703,7 +1703,7 @@ public class PlayerCharacter extends AbstractCharacter {
         Zone zone = ZoneManager.findSmallestZone(this.getLoc());
 
         if (zone != null) {
-            return zone.peaceZone == (byte) 1;
+            return zone.peace_zone == (byte) 1;
         }
 
         return false;
@@ -1797,7 +1797,7 @@ public class PlayerCharacter extends AbstractCharacter {
 
             //DeathShroud
 
-            if (zone.peaceZone == 0)
+            if (zone.peace_zone == 0)
                 PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 1672601862, 40, false);
 
             //enable this to give players deathshroud if mobs kill player.
@@ -1843,7 +1843,7 @@ public class PlayerCharacter extends AbstractCharacter {
 
         //DeathShroud
 
-        if (zone.peaceZone == 0)
+        if (zone.peace_zone == 0)
             PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 1672601862, 40, false);
 
         if (doPVPEXP) {
@@ -1898,7 +1898,7 @@ public class PlayerCharacter extends AbstractCharacter {
         killCleanup();
         Zone zone = ZoneManager.findSmallestZone(this.getLoc());
 
-        if (zone.peaceZone == 0)
+        if (zone.peace_zone == 0)
             PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 1672601862, 40, false);
 
         // Send death message if needed

src/engine/objects/Zone.java

@@ -39,7 +39,7 @@ public class Zone extends AbstractGameObject {
     public final float zOffset;
     public final float yOffset;
     public final int zoneTemplate;
-    public final byte peaceZone;
+    public final byte peace_zone;
     public final String Icon1;
     public final String Icon2;
     public final String Icon3;
@@ -54,7 +54,7 @@ public class Zone extends AbstractGameObject {
     public Zone parent = null;
     public Bounds bounds;
     public boolean isNPCCity = false;
-    public boolean isGuildZone;
+    public boolean guild_zone;
     public String hash;
     public float worldAltitude = 0;
     public float seaLevel = 0f;
@@ -69,13 +69,13 @@ public class Zone extends AbstractGameObject {
         super(rs);
         this.parentZoneID = rs.getInt("parent");
         this.playerCityUUID = rs.getInt("playerCityUUID");
-        this.isGuildZone = this.playerCityUUID != 0;
+        this.guild_zone = this.playerCityUUID != 0;
         this.zoneName = rs.getString("zoneName");
         this.xOffset = rs.getFloat("xOffset");
         this.zOffset = rs.getFloat("zOffset");
         this.yOffset = rs.getFloat("yOffset");
         this.zoneTemplate = rs.getInt("template");
-        this.peaceZone = rs.getByte("peaceZone");
+        this.peace_zone = rs.getByte("peace_zone");
         this.Icon1 = rs.getString("icon1");
         this.Icon2 = rs.getString("icon2");
         this.Icon3 = rs.getString("icon3");
@@ -146,7 +146,7 @@ public class Zone extends AbstractGameObject {
             writer.putString(city.getCityName());
         else
             writer.putString(zone.zoneName);
-        writer.put(zone.peaceZone);
+        writer.put(zone.peace_zone);
         writer.putString(zone.Icon1);
         writer.putString(zone.Icon2);
         writer.putString(zone.Icon3);
@@ -238,7 +238,7 @@ public class Zone extends AbstractGameObject {
 
         // Macro zones have icons.
 
-        if (this.isGuildZone == true)
+        if (this.guild_zone == true)
             return false;
 
         if (this.parent == null)
@@ -310,7 +310,7 @@ public class Zone extends AbstractGameObject {
 
     public HeightMap getHeightMap() {
 
-        if (this.isGuildZone)
+        if (this.guild_zone)
             return HeightMap.PlayerCityHeightMap;
 
         return HeightMap.heightmapByLoadNum.get(this.zoneTemplate);