diff --git a/src/main/java/com/modnmetl/virtualrealty/commands/vrplot/subcommand/AssignSubCommand.java b/src/main/java/com/modnmetl/virtualrealty/commands/vrplot/subcommand/AssignSubCommand.java index 7f79307..44e6b84 100644 --- a/src/main/java/com/modnmetl/virtualrealty/commands/vrplot/subcommand/AssignSubCommand.java +++ b/src/main/java/com/modnmetl/virtualrealty/commands/vrplot/subcommand/AssignSubCommand.java @@ -26,8 +26,8 @@ public class AssignSubCommand extends SubCommand { HELP.add(" §a/vrplot assign §8<§7plot§8> §8<§7username§8>"); } - public AssignSubCommand(CommandSender sender, Command command, String label, String[] args, boolean bypass) throws FailedCommandException { - super(sender, command, label, args, bypass, HELP); + public AssignSubCommand(CommandSender sender, Command command, String label, String[] args) throws FailedCommandException { + super(sender, command, label, args, HELP); } @Override diff --git a/src/main/java/com/modnmetl/virtualrealty/objects/region/GridStructure.java b/src/main/java/com/modnmetl/virtualrealty/objects/region/GridStructure.java index 330a70b..e5c55ff 100644 --- a/src/main/java/com/modnmetl/virtualrealty/objects/region/GridStructure.java +++ b/src/main/java/com/modnmetl/virtualrealty/objects/region/GridStructure.java @@ -104,11 +104,15 @@ public void preview(Location playerPreviewLocation, boolean visualization, boole default: throw new IllegalStateException("Unexpected value: " + direction); } + Location distanceCalculateLoc = previewLocation; + if (playerPreviewLocation != null) { + distanceCalculateLoc = playerPreviewLocation; + } for (int x = minX - 1; x < maxX; x++) { for (int z = minZ; z < maxZ; z++) { if (x == minX - 1 || z == minZ || x == maxX - 1 || z == maxZ - 1) { Block block = previewLocation.getWorld().getBlockAt(x, previewLocation.getBlockY(), z); - if (previewLocation.distance(block.getLocation()) < maxDistance) { + if (distanceCalculateLoc.distance(block.getLocation()) < maxDistance) { borderBlocks.add(block); } } @@ -164,7 +168,7 @@ public void preview(Location playerPreviewLocation, boolean visualization, boole BlockVector2 secondPillarV = BlockVector2.at(maxX - 1, minZ); BlockVector2 thirdPillarV = BlockVector2.at(minX - 1, maxZ - 1); BlockVector2 fourthPillarV = BlockVector2.at(maxX - 1, maxZ - 1); - BlockVector2 previewV = BlockVector2.at(previewLocation.getBlockX(), previewLocation.getBlockZ()); + BlockVector2 previewV = BlockVector2.at(distanceCalculateLoc.getBlockX(), distanceCalculateLoc.getBlockZ()); if (VectorUtils.distance(previewV, firstPillarV) < maxDistance) { for (int y = bottomLeftCorner.getBlockY(); y < bottomLeftCorner.getBlockY() + getHeight() + 10; y++) { blocks.add(firstPillarV.toLocation(this.world, y).getBlock());