ExprBlocks - BlockLineIterator

src/main/java/ch/njol/skript/expressions/ExprBlocks.java

@@ -20,6 +20,7 @@
 
 import java.util.Iterator;
 
+import ch.njol.skript.lang.function.ExprFunctionCall;
 import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
@@ -157,6 +158,8 @@ public Iterator<Block> iterator(Event event) {
 						if (number != null)
 							distance = number.intValue();
 					}
+				} else if (this.direction instanceof ExprFunctionCall) {
+					distance = (int) this.direction.getSingle(event).getDirection().length();
 				}
 				return new BlockLineIterator(location, vector, distance);
 			} else {

src/main/java/ch/njol/skript/util/BlockLineIterator.java

@@ -18,14 +18,14 @@
  */
 package ch.njol.skript.util;
 
+import ch.njol.skript.bukkitutil.WorldUtils;
+import ch.njol.util.Math2;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.util.BlockIterator;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.Nullable;
 
-import ch.njol.skript.bukkitutil.WorldUtils;
-import ch.njol.util.Math2;
 import ch.njol.util.NullableChecker;
 import ch.njol.util.coll.iterator.StoppableIterator;
 
@@ -37,8 +37,10 @@ public class BlockLineIterator extends StoppableIterator<Block> {
 	 * @throws IllegalStateException randomly (Bukkit bug)
 	 */
 	public BlockLineIterator(Block start, Block end) throws IllegalStateException {
-		super(new BlockIterator(start.getWorld(), fitInWorld(start.getLocation().add(0.5, 0.5, 0.5), end.getLocation().subtract(start.getLocation()).toVector()),
-				end.equals(start) ? new Vector(1, 0, 0) : end.getLocation().subtract(start.getLocation()).toVector(), 0, 0), // should prevent an error if start = end
+		super(new BlockIterator(start.getWorld(), start.getLocation().toVector(),
+				end.equals(start) ? new Vector(1, 0, 0) : end.getLocation().subtract(start.getLocation()).toVector(),
+				0, 0
+			), // should prevent an error if start = end
 		new NullableChecker<Block>() {
 			private final double overshotSq = Math.pow(start.getLocation().distance(end.getLocation()) + 2, 2);
 
@@ -59,7 +61,7 @@ public boolean check(@Nullable Block block) {
 	 * @throws IllegalStateException randomly (Bukkit bug)
 	 */
 	public BlockLineIterator(Location start, Vector direction, double distance) throws IllegalStateException {
-		super(new BlockIterator(start.getWorld(), fitInWorld(start, direction), direction, 0, 0), new NullableChecker<Block>() {
+		super(new BlockIterator(start.getWorld(), start.toVector(), direction, 0, 0), new NullableChecker<Block>() {
 			private final double distSq = distance * distance;
 
 			@Override

src/test/skript/tests/syntaxes/expressions/ExprBlocks.sk

@@ -0,0 +1,17 @@
+test "blocks void":
+	set {_loc} to location(0.5, 320.5, 0.5)
+	set {_blocks::*} to blocks between {_loc} and ({_loc} ~ vector(10,0,0))
+	assert size of {_blocks::*} is 11 with "Blocks between loc and (loc~vector(10,0,0)) is not 11"
+	assert blocks at {_blocks::*} is void air with "Blocks can be set in the void?"
+	set blocks at {_blocks::*} to stone
+	assert blocks at {_blocks::*} is void air with "Blocks can be set in the void?"
+
+test "blocks vector direction":
+	set {_loc} to (spawn of world "world") ~ vector(10,10,0)
+	set {_blocks::*} to blocks vector(10,0,0) {_loc}
+	assert size of {_blocks::*} is 10 with "Blocks vector(10,0,0) loc is not 10"
+	set blocks at {_blocks::*} to stone
+	assert blocks at {_blocks::*} is stone with "1 or more blocks were not set to stone"
+	set blocks at {_blocks::*} to air
+	assert blocks at {_blocks::*} is air with "1 or more blocks were not set to stone"
+