abelhooge/TerraForged
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add extra bounds checks just in case

Browse Source
This commit is contained in:
dags- 2020-07-01 19:42:31 +01:00
parent dc42f1d519
commit b4cca80243
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/terraforged/mod/biome/map/SimpleBiomeMap.java
View File

@ -80,13 +80,25 @@ public class SimpleBiomeMap implements BiomeMap {
@Override
public Biome getCoast(Cell cell) {
int inland = land.getSize(cell);
// treat land & coast biome-sets as one combined set
Biome[] inland = land.getSet(cell);
Biome[] coastal = coast.getSet(cell);
int total = inland + coastal.length;
int index = NoiseUtil.round((total - 1) * cell.biome);
if (index >= inland) {
return coastal[index - inland];
// calculate where in the combined set the cell.biome points
int maxIndex = inland.length + coastal.length - 1;
int index = NoiseUtil.round(maxIndex * cell.biome);
// if index lies within the coast section of the set
if (index >= inland.length) {
// relativize the index to start at 0
index -= inland.length;
// shouldn't be required but check that index is within bounds
if (index < coastal.length) {
return coastal[index];
}
}
return DefaultBiomes.NONE;
}

11
src/main/java/com/terraforged/mod/biome/map/set/BiomeSet.java
View File

@ -47,7 +47,16 @@ public abstract class BiomeSet {
if (set.length == 0) {
return defaultBiome.getDefaultBiome(cell.temperature);
}
return set[NoiseUtil.round((set.length - 1) * cell.biome)];
int maxIndex = set.length - 1;
int index = NoiseUtil.round(maxIndex * cell.biome);
// shouldn't happen but safety check the bounds
if (index < 0 || index >= set.length) {
return defaultBiome.getDefaultBiome(cell.temperature);
}
return set[index];
}
public abstract int getIndex(Cell cell);