EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 21:26:45 +01:00
Code Issues Projects Releases Wiki Activity

possible NPE fix and add useful debug if it fails

Browse Source
This commit is contained in:
dordsor21 2019-01-17 22:34:28 +00:00
parent d846bc7a2e
commit 330ab83ece
1 changed files with 51 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java
View File

@ -151,7 +151,9 @@ public class BukkitHybridUtils extends HybridUtils {
continue; continue;
} }
int y = MainUtil.y_loc[i][j]; int y = MainUtil.y_loc[i][j];
oldBlocks[y][x][z] = result[i][j]; oldBlocks[y][x][z] = result[i][j] != null ?
result[i][j] :
BlockBucket.withSingle(StringPlotBlock.EVERYTHING);
} }
} }
@ -169,47 +171,58 @@ public class BukkitHybridUtils extends HybridUtils {
HashSet<PlotBlock> types = new HashSet<>(); HashSet<PlotBlock> types = new HashSet<>();
for (int y = 0; y < 256; y++) { for (int y = 0; y < 256; y++) {
BlockBucket old = oldBlocks[y][x][z]; BlockBucket old = oldBlocks[y][x][z];
PlotBlock now = newBlocks[y][x][z]; try {
if (!old.getBlocks().contains(now)) { if (old == null) {
changes[i]++; old = BlockBucket.withSingle(StringPlotBlock.EVERYTHING);
}
if (now.isAir()) {
air[i]++;
} else {
// check vertices
// modifications_adjacent
if (x > 0 && z > 0 && y > 0 && x < width - 1 && z < length - 1
&& y < 255) {
if (newBlocks[y - 1][x][z].isAir()) {
faces[i]++;
}
if (newBlocks[y][x - 1][z].isAir()) {
faces[i]++;
}
if (newBlocks[y][x][z - 1].isAir()) {
faces[i]++;
}
if (newBlocks[y + 1][x][z].isAir()) {
faces[i]++;
}
if (newBlocks[y][x + 1][z].isAir()) {
faces[i]++;
}
if (newBlocks[y][x][z + 1].isAir()) {
faces[i]++;
}
} }
PlotBlock now = newBlocks[y][x][z];
if (!old.getBlocks().contains(now)) {
changes[i]++;
}
if (now.isAir()) {
air[i]++;
} else {
// check vertices
// modifications_adjacent
if (x > 0 && z > 0 && y > 0 && x < width - 1 && z < length - 1
&& y < 255) {
if (newBlocks[y - 1][x][z].isAir()) {
faces[i]++;
}
if (newBlocks[y][x - 1][z].isAir()) {
faces[i]++;
}
if (newBlocks[y][x][z - 1].isAir()) {
faces[i]++;
}
if (newBlocks[y + 1][x][z].isAir()) {
faces[i]++;
}
if (newBlocks[y][x + 1][z].isAir()) {
faces[i]++;
}
if (newBlocks[y][x][z + 1].isAir()) {
faces[i]++;
}
}
Material material = now.to(Material.class); Material material = now.to(Material.class);
if (material != null) { if (material != null) {
BlockData blockData = material.createBlockData(); BlockData blockData = material.createBlockData();
if (blockData instanceof Directional) { if (blockData instanceof Directional) {
data[i] += 8; data[i] += 8;
} else if (!blockData.getClass().equals(BlockData.class)) { } else if (!blockData.getClass().equals(BlockData.class)) {
data[i]++; data[i]++;
}
} }
types.add(now);
} }
types.add(now); } catch (NullPointerException e) {
PlotSquared.log(old.toString());
PlotSquared.log(x);
PlotSquared.log(y);
PlotSquared.log(z);
e.printStackTrace();
} }
} }
variety[i] = types.size(); variety[i] = types.size();