|
|
@ -97,7 +97,7 @@ public class Zone extends AbstractGameObject { |
|
|
|
this.min_blend = rs.getFloat("min_blend"); |
|
|
|
this.min_blend = rs.getFloat("min_blend"); |
|
|
|
this.max_blend = rs.getFloat("max_blend"); |
|
|
|
this.max_blend = rs.getFloat("max_blend"); |
|
|
|
this.sea_level_type = rs.getString("sea_level_type"); |
|
|
|
this.sea_level_type = rs.getString("sea_level_type"); |
|
|
|
this.sea_level = rs.getFloat("sea_level"); |
|
|
|
this.sea_level_offset = rs.getFloat("sea_level"); |
|
|
|
this.terrain_type = rs.getString("terrain_type"); |
|
|
|
this.terrain_type = rs.getString("terrain_type"); |
|
|
|
this.terrain_max_y = rs.getFloat("terrain_max_y"); |
|
|
|
this.terrain_max_y = rs.getFloat("terrain_max_y"); |
|
|
|
this.terrain_image = rs.getInt("terrain_image"); |
|
|
|
this.terrain_image = rs.getInt("terrain_image"); |
|
|
@ -272,16 +272,15 @@ public class Zone extends AbstractGameObject { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public ArrayList<Zone> getNodes() { |
|
|
|
public ArrayList<Zone> getNodes() { |
|
|
|
|
|
|
|
|
|
|
|
if (this.nodes == null) { |
|
|
|
if (this.nodes == null) { |
|
|
|
this.nodes = DbManager.ZoneQueries.GET_MAP_NODES(super.getObjectUUID()); |
|
|
|
this.nodes = DbManager.ZoneQueries.GET_MAP_NODES(super.getObjectUUID()); |
|
|
|
|
|
|
|
|
|
|
|
//Add reverse lookup for child->parent
|
|
|
|
//Add reverse lookup for child->parent
|
|
|
|
if (this.nodes != null) |
|
|
|
if (this.nodes != null) |
|
|
|
for (Zone zone : this.nodes) { |
|
|
|
for (Zone zone : this.nodes) |
|
|
|
zone.setParent(this); |
|
|
|
zone.setParent(this); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return nodes; |
|
|
|
return nodes; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -312,7 +311,6 @@ public class Zone extends AbstractGameObject { |
|
|
|
return this.parent.equals(ZoneManager.getSeaFloor()); |
|
|
|
return this.parent.equals(ZoneManager.getSeaFloor()); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public void setHash() { |
|
|
|
public void setHash() { |
|
|
|
|
|
|
|
|
|
|
|
this.hash = DataWarehouse.hasher.encrypt(this.getObjectUUID()); |
|
|
|
this.hash = DataWarehouse.hasher.encrypt(this.getObjectUUID()); |
|
|
@ -322,6 +320,4 @@ public class Zone extends AbstractGameObject { |
|
|
|
DataWarehouse.writeHash(Enum.DataRecordType.ZONE, this.getObjectUUID()); |
|
|
|
DataWarehouse.writeHash(Enum.DataRecordType.ZONE, this.getObjectUUID()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Return heightmap for this Zone.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|