Browse Source

Removed unused variables from class.

feature-workorder
MagicBot 1 year ago
parent
commit
48fc5af5f7
  1. 19
      src/engine/objects/City.java

19
src/engine/objects/City.java

@ -66,9 +66,6 @@ public class City extends AbstractWorldObject {
private int realmID; private int realmID;
private int radiusType; private int radiusType;
private float bindRadius; private float bindRadius;
private float statLat;
private float statAlt;
private float statLon;
private float bindX; private float bindX;
private float bindZ; private float bindZ;
private byte isNpc; //aka Safehold 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.established = java.time.LocalDateTime.ofInstant(establishedTimeStamp.toInstant(), ZoneId.systemDefault());
this.location = new Vector3fImmutable(rs.getFloat("xCoord"), rs.getFloat("yCoord"), rs.getFloat("zCoord")); 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"); java.sql.Timestamp realmTaxTimeStamp = rs.getTimestamp("realmTaxDate");
@ -159,11 +153,6 @@ public class City extends AbstractWorldObject {
this.motto = guild.getMotto(); this.motto = guild.getMotto();
} }
//Disabled till i finish.
// this.reverseKOS = rs.getInt("kos") == 1;
Zone zone = ZoneManager.getZoneByUUID(rs.getInt("parent")); Zone zone = ZoneManager.getZoneByUUID(rs.getInt("parent"));
if (zone != null) if (zone != null)
@ -171,18 +160,12 @@ public class City extends AbstractWorldObject {
//npc cities without heightmaps except swampstone are specials. //npc cities without heightmaps except swampstone are specials.
this.realmID = rs.getInt("realmID"); this.realmID = rs.getInt("realmID");
} catch (Exception e) { } catch (Exception e) {
Logger.error(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.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.bindLoc = new Vector3fImmutable(this.location.x + this.bindX,
this.location.y, this.location.y,
this.location.z + this.bindZ); this.location.z + this.bindZ);

Loading…
Cancel
Save