diff --git a/src/engine/objects/City.java b/src/engine/objects/City.java index b503f8fb..21185423 100644 --- a/src/engine/objects/City.java +++ b/src/engine/objects/City.java @@ -66,9 +66,6 @@ public class City extends AbstractWorldObject { private int realmID; private int radiusType; private float bindRadius; - private float statLat; - private float statAlt; - private float statLon; private float bindX; private float bindZ; private byte isNpc; //aka Safehold @@ -114,9 +111,6 @@ public class City extends AbstractWorldObject { this.established = java.time.LocalDateTime.ofInstant(establishedTimeStamp.toInstant(), ZoneId.systemDefault()); this.location = new Vector3fImmutable(rs.getFloat("xCoord"), rs.getFloat("yCoord"), rs.getFloat("zCoord")); - this.statLat = rs.getFloat("xCoord"); - this.statAlt = rs.getFloat("yCoord"); - this.statLon = rs.getFloat("zCoord"); java.sql.Timestamp realmTaxTimeStamp = rs.getTimestamp("realmTaxDate"); @@ -159,11 +153,6 @@ public class City extends AbstractWorldObject { this.motto = guild.getMotto(); } - - //Disabled till i finish. - // this.reverseKOS = rs.getInt("kos") == 1; - - Zone zone = ZoneManager.getZoneByUUID(rs.getInt("parent")); if (zone != null) @@ -171,18 +160,12 @@ public class City extends AbstractWorldObject { //npc cities without heightmaps except swampstone are specials. - this.realmID = rs.getInt("realmID"); } catch (Exception e) { Logger.error(e); } - // *** Refactor: Is this working? Intended to supress - // login server errors from attempting to - // load cities/realms along with players - - } /* @@ -624,7 +607,7 @@ public class City extends AbstractWorldObject { this.parentZone = zone; - this.location = new Vector3fImmutable(zone.absX + statLat, zone.absY + statAlt, zone.absZ + statLon); + this.location = new Vector3fImmutable(zone.absX, zone.absY, zone.absZ); this.bindLoc = new Vector3fImmutable(this.location.x + this.bindX, this.location.y, this.location.z + this.bindZ);