Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-24 19:25:15 +01:00
Code Issues Projects Releases Wiki Activity

Add some extra array bounds protection

Browse Source
This commit is contained in:
Mike Primm 2012-02-11 23:28:44 -06:00
parent 1ef9bdd861
commit 0053d89d2b
1 changed files with 43 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/main/java/org/dynmap/bukkit/NewMapChunkCache.java
View File

@ -160,44 +160,56 @@ public class NewMapChunkCache implements MapChunkCache {
}
public final BiomeMap getBiome() {
return biomemap[x - x_base][z - z_base];
try {
return biomemap[x - x_base][z - z_base];
} catch (Exception ex) {
return BiomeMap.NULL;
}
}
public final int countSmoothedSwampBiomes() {
return swampcnt[x - x_base][z - z_base];
try {
return swampcnt[x - x_base][z - z_base];
} catch (Exception ex) {
return 0;
}
}
public final int countSmoothedSwampBiomes(int sx, int sz, int scale) {
int xx = x - x_base;
int zz = z - z_base;
sx <<= 1;
sz <<= 1;
int s0 = swampcnt[xx][zz];
int w;
int tot;
if(sx < scale) {
w = scale - sx;
tot = (w * swampcnt[xx-1][zz]) + ((scale - w) * s0);
try {
int xx = x - x_base;
int zz = z - z_base;
sx <<= 1;
sz <<= 1;
int s0 = swampcnt[xx][zz];
int w;
int tot;
if(sx < scale) {
w = scale - sx;
tot = (w * swampcnt[xx-1][zz]) + ((scale - w) * s0);
}
else if(sx > scale) {
w = sx - scale;
tot = (w * swampcnt[xx+1][zz]) + ((scale - w) * s0);
}
else {
tot = scale * s0;
}
if(sz < scale) {
w = scale - sz;
tot += (w * swampcnt[xx][zz-1]) + ((scale - w) * s0);
}
else if(sz > scale) {
w = sz - scale;
tot += (w * swampcnt[xx][zz+1]) + ((scale - w) * s0);
}
else {
tot += scale * s0;
}
return tot;
} catch (Exception ex) {
return 0;
}
else if(sx > scale) {
w = sx - scale;
tot = (w * swampcnt[xx+1][zz]) + ((scale - w) * s0);
}
else {
tot = scale * s0;
}
if(sz < scale) {
w = scale - sz;
tot += (w * swampcnt[xx][zz-1]) + ((scale - w) * s0);
}
else if(sz > scale) {
w = sz - scale;
tot += (w * swampcnt[xx][zz+1]) + ((scale - w) * s0);
}
else {
tot += scale * s0;
}
return tot;
}
public final double getRawBiomeTemperature() {