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

Fix NPE on world initialise

Browse Source
This commit is contained in:
dordsor21 2019-01-17 13:19:24 +00:00
parent f366f5e406
commit ea422b5561
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
View File

@ -42,9 +42,17 @@ public class HybridGen extends IndependentPlotGenerator {
for (short x = 0; x < 16; x++) { for (short x = 0; x < 16; x++) {
for (short z = 0; z < 16; z++) { for (short z = 0; z < 16; z++) {
for (int y = 1; y < hpw.PLOT_HEIGHT; y++) { for (int y = 1; y < hpw.PLOT_HEIGHT; y++) {
blockBuckets[y >> 4][((y & 0xF) << 8) | (z << 4) | x] = hpw.MAIN_BLOCK; int layer = y >> 4;
if (blockBuckets[layer] == null) {
blockBuckets[layer] = new BlockBucket[4096];
} }
blockBuckets[hpw.PLOT_HEIGHT >> 4][((hpw.PLOT_HEIGHT & 0xF) << 8) | (z << 4) | x] = blockBuckets[layer][((y & 0xF) << 8) | (z << 4) | x] = hpw.MAIN_BLOCK;
}
int layer = hpw.PLOT_HEIGHT >> 4;
if (blockBuckets[layer] == null) {
blockBuckets[layer] = new BlockBucket[4096];
}
blockBuckets[layer][((hpw.PLOT_HEIGHT & 0xF) << 8) | (z << 4) | x] =
hpw.MAIN_BLOCK; hpw.MAIN_BLOCK;
} }
} }

18
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SingleWorldGenerator.java
View File

@ -26,7 +26,11 @@ public class SingleWorldGenerator extends IndependentPlotGenerator {
for (int x = bedrock1.getX(); x <= bedrock2.getX(); x++) { for (int x = bedrock1.getX(); x <= bedrock2.getX(); x++) {
for (int z = bedrock1.getZ(); z <= bedrock2.getZ(); z++) { for (int z = bedrock1.getZ(); z <= bedrock2.getZ(); z++) {
for (int y = bedrock1.getY(); y <= bedrock2.getY(); y++) { for (int y = bedrock1.getY(); y <= bedrock2.getY(); y++) {
blockBuckets[y >> 4][((y & 0xF) << 8) | (z << 4) | x] = int layer = y >> 4;
if (blockBuckets[layer] == null) {
blockBuckets[layer] = new BlockBucket[4096];
}
blockBuckets[layer][((y & 0xF) << 8) | (z << 4) | x] =
BlockBucket.withSingle(PlotBlock.get("bedrock")); BlockBucket.withSingle(PlotBlock.get("bedrock"));
} }
} }
@ -34,7 +38,11 @@ public class SingleWorldGenerator extends IndependentPlotGenerator {
for (int x = dirt1.getX(); x <= dirt2.getX(); x++) { for (int x = dirt1.getX(); x <= dirt2.getX(); x++) {
for (int z = dirt1.getZ(); z <= dirt2.getZ(); z++) { for (int z = dirt1.getZ(); z <= dirt2.getZ(); z++) {
for (int y = dirt1.getY(); y <= dirt2.getY(); y++) { for (int y = dirt1.getY(); y <= dirt2.getY(); y++) {
blockBuckets[y >> 4][((y & 0xF) << 8) | (z << 4) | x] = int layer = y >> 4;
if (blockBuckets[layer] == null) {
blockBuckets[layer] = new BlockBucket[4096];
}
blockBuckets[layer][((y & 0xF) << 8) | (z << 4) | x] =
BlockBucket.withSingle(PlotBlock.get("dirt")); BlockBucket.withSingle(PlotBlock.get("dirt"));
} }
} }
@ -42,7 +50,11 @@ public class SingleWorldGenerator extends IndependentPlotGenerator {
for (int x = grass1.getX(); x <= grass2.getX(); x++) { for (int x = grass1.getX(); x <= grass2.getX(); x++) {
for (int z = grass1.getZ(); z <= grass2.getZ(); z++) { for (int z = grass1.getZ(); z <= grass2.getZ(); z++) {
for (int y = grass1.getY(); y <= grass2.getY(); y++) { for (int y = grass1.getY(); y <= grass2.getY(); y++) {
blockBuckets[y >> 4][((y & 0xF) << 8) | (z << 4) | x] = int layer = y >> 4;
if (blockBuckets[layer] == null) {
blockBuckets[layer] = new BlockBucket[4096];
}
blockBuckets[layer][((y & 0xF) << 8) | (z << 4) | x] =
BlockBucket.withSingle(PlotBlock.get("grass_block")); BlockBucket.withSingle(PlotBlock.get("grass_block"));
} }
} }