mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-22 23:34:44 +02:00
Compare commits
3 Commits
6.10.3
...
feature/v6
Author | SHA1 | Date | |
---|---|---|---|
9ee3e9a3a4 | |||
28bd993680 | |||
8330f37d8a |
@ -234,8 +234,19 @@ public class HybridUtils {
|
|||||||
Set<BlockType> types = new HashSet<>();
|
Set<BlockType> types = new HashSet<>();
|
||||||
for (int yIndex = 0; yIndex < height; yIndex++) {
|
for (int yIndex = 0; yIndex < height; yIndex++) {
|
||||||
BlockState old = oldBlocks[yIndex][x][z]; // Nullable
|
BlockState old = oldBlocks[yIndex][x][z]; // Nullable
|
||||||
try {
|
|
||||||
BlockState now = newBlocks[yIndex][x][z]; // Not null
|
BlockState now = newBlocks[yIndex][x][z]; // Not null
|
||||||
|
if (now == null) {
|
||||||
|
throw new NullPointerException(String.format(
|
||||||
|
"\"now\" block null attempting to perform plot analysis. Indexes: x=%d of %d, yIndex=%d" +
|
||||||
|
" of %d, z=%d of %d",
|
||||||
|
x,
|
||||||
|
width,
|
||||||
|
yIndex,
|
||||||
|
height,
|
||||||
|
z,
|
||||||
|
length
|
||||||
|
));
|
||||||
|
}
|
||||||
if (!now.equals(old) && !(old == null && now.getBlockType().equals(BlockTypes.AIR))) {
|
if (!now.equals(old) && !(old == null && now.getBlockType().equals(BlockTypes.AIR))) {
|
||||||
changes[i]++;
|
changes[i]++;
|
||||||
}
|
}
|
||||||
@ -270,9 +281,6 @@ public class HybridUtils {
|
|||||||
}
|
}
|
||||||
types.add(now.getBlockType());
|
types.add(now.getBlockType());
|
||||||
}
|
}
|
||||||
} catch (NullPointerException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
variety[i] = types.size();
|
variety[i] = types.size();
|
||||||
i++;
|
i++;
|
||||||
|
@ -19,7 +19,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
group = "com.plotsquared"
|
group = "com.plotsquared"
|
||||||
version = "6.10.3"
|
version = "6.10.4-SNAPSHOT"
|
||||||
|
|
||||||
subprojects {
|
subprojects {
|
||||||
group = rootProject.group
|
group = rootProject.group
|
||||||
@ -65,7 +65,7 @@ subprojects {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.17"))
|
implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.18"))
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
Reference in New Issue
Block a user