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

whoops, forgot a return statement

Browse Source
This commit is contained in:
boy0001 2014-09-24 22:32:25 +10:00
parent d7bd7ba093
commit 4c36c9b8d8
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java
View File

@ -515,7 +515,10 @@ public class PlotHelper {
for (int y = 0; y < 1; y++) { for (int y = 0; y < 1; y++) {
for (int x = pos1.getBlockX(); x <= pos2.getBlockX(); x++) { for (int x = pos1.getBlockX(); x <= pos2.getBlockX(); x++) {
for (int z = pos1.getBlockZ(); z <= pos2.getBlockZ(); z++) { for (int z = pos1.getBlockZ(); z <= pos2.getBlockZ(); z++) {
SetBlockFast.set(world, x, y, z, 7, (byte) 0); Block block = world.getBlockAt(x, y, z);
if (!((block.getTypeId() == 7))) {
SetBlockFast.set(world, x, y, z, 7, (byte) 7);
}
} }
} }
} }
@ -525,24 +528,33 @@ public class PlotHelper {
int i = random(filling.length); int i = random(filling.length);
short id = filling[i]; short id = filling[i];
byte d = (byte) filling_data[i]; byte d = (byte) filling_data[i];
Block block = world.getBlockAt(x, y, z);
if (!((block.getTypeId() == id && block.getData() == d))) {
SetBlockFast.set(world, x, y, z, id, d); SetBlockFast.set(world, x, y, z, id, d);
} }
} }
} }
}
for (int y = plotworld.PLOT_HEIGHT; y < (plotworld.PLOT_HEIGHT + 1); y++) { for (int y = plotworld.PLOT_HEIGHT; y < (plotworld.PLOT_HEIGHT + 1); y++) {
for (int x = pos1.getBlockX(); x <= pos2.getBlockX(); x++) { for (int x = pos1.getBlockX(); x <= pos2.getBlockX(); x++) {
for (int z = pos1.getBlockZ(); z <= pos2.getBlockZ(); z++) { for (int z = pos1.getBlockZ(); z <= pos2.getBlockZ(); z++) {
int i = random(plotfloors.length); int i = random(plotfloors.length);
short id = plotfloors[i]; short id = plotfloors[i];
byte d = (byte) plotfloors_data[i]; byte d = (byte) plotfloors_data[i];
Block block = world.getBlockAt(x, y, z);
if (!((block.getTypeId() == id && block.getData() == d))) {
SetBlockFast.set(world, x, y, z, id, d); SetBlockFast.set(world, x, y, z, id, d);
} }
} }
} }
}
for (int y = plotworld.PLOT_HEIGHT + 1; y < (world.getMaxHeight() + 1); y++) { for (int y = plotworld.PLOT_HEIGHT + 1; y < (world.getMaxHeight() + 1); y++) {
for (int x = pos1.getBlockX(); x <= pos2.getBlockX(); x++) { for (int x = pos1.getBlockX(); x <= pos2.getBlockX(); x++) {
for (int z = pos1.getBlockZ(); z <= pos2.getBlockZ(); z++) { for (int z = pos1.getBlockZ(); z <= pos2.getBlockZ(); z++) {
SetBlockFast.set(world, x, y, z, 0, (byte) 0); Block block = world.getBlockAt(x, y, z);
if (!((block.getTypeId() == 0))) {
block.setTypeId(0, false);
}
} }
} }
} }
@ -554,6 +566,7 @@ public class PlotHelper {
} }
} }
})); }));
return;
} }
if ((pos2.getBlockX() - pos1.getBlockX()) < 16) { if ((pos2.getBlockX() - pos1.getBlockX()) < 16) {
setSimpleCuboid(world, new Location(world, pos1.getBlockX(), 0, pos1.getBlockZ()), new Location(world, pos2.getBlockX(), 1, pos2.getBlockZ()), (short) 7); setSimpleCuboid(world, new Location(world, pos1.getBlockX(), 0, pos1.getBlockZ()), new Location(world, pos2.getBlockX(), 1, pos2.getBlockZ()), (short) 7);