class and table schema now conform to JSON

This commit is contained in:
2023-09-20 16:06:57 -04:00
parent be107c0858
commit 34d450fecf
9 changed files with 17 additions and 17 deletions
+6 -6
View File
@@ -38,7 +38,7 @@ public class Zone extends AbstractGameObject {
public final float xOffset;
public final float zOffset;
public final float yOffset;
public final int zoneTemplate;
public final int template;
public final byte peace_zone;
public final String Icon1;
public final String Icon2;
@@ -74,7 +74,7 @@ public class Zone extends AbstractGameObject {
this.xOffset = rs.getFloat("xOffset");
this.zOffset = rs.getFloat("zOffset");
this.yOffset = rs.getFloat("yOffset");
this.zoneTemplate = rs.getInt("template");
this.template = rs.getInt("template");
this.peace_zone = rs.getByte("peace_zone");
this.Icon1 = rs.getString("icon1");
this.Icon2 = rs.getString("icon2");
@@ -106,7 +106,7 @@ public class Zone extends AbstractGameObject {
public static void serializeForClientMsg(Zone zone, ByteBufferWriter writer) {
if (zone.zoneTemplate == 0 && zone.playerCityUUID == 0)
if (zone.template == 0 && zone.playerCityUUID == 0)
Logger.warn("Warning! WorldServerMap with ID " + zone.getObjectUUID() + " has a loadnum of 0 (player city) and no city linked. This will probably crash the client!");
// Player City Terraform values serialized here.
@@ -124,7 +124,7 @@ public class Zone extends AbstractGameObject {
writer.putInt(0);
writer.putInt(0);
writer.putInt(zone.zoneTemplate);
writer.putInt(zone.template);
if (zone.playerCityUUID > 0) {
City k = City.getCity(zone.playerCityUUID);
@@ -167,7 +167,7 @@ public class Zone extends AbstractGameObject {
this.bounds = Bounds.borrow();
Vector2f zoneSize = ZoneManager._zone_size_data.get(this.zoneTemplate);
Vector2f zoneSize = ZoneManager._zone_size_data.get(this.template);
// Default to player zone size on error? Maybe log this
@@ -313,7 +313,7 @@ public class Zone extends AbstractGameObject {
if (this.guild_zone)
return HeightMap.PlayerCityHeightMap;
return HeightMap.heightmapByLoadNum.get(this.zoneTemplate);
return HeightMap.heightmapByLoadNum.get(this.template);
}
}