class and table schema now conform to JSON

This commit is contained in:
2023-09-20 16:05:57 -04:00
parent 8289786099
commit be107c0858
20 changed files with 39 additions and 39 deletions
+7 -7
View File
@@ -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);