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

@@ -24,8 +24,6 @@
 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 +35,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 +59,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
@@ -87,14 +87,7 @@ public BlockLineIterator(Block start, Vector direction, double distance) throws
 	 * @return The newly modified Vector if needed.
 	 */
 	private static Vector fitInWorld(Location location, Vector direction) {
-		int lowest = WorldUtils.getWorldMinHeight(location.getWorld());
-		int highest = location.getWorld().getMaxHeight();
-		Vector vector = location.toVector();
-		int y = location.getBlockY();
-		if (y >= lowest && y <= highest)
-			return vector;
-		double newY = Math2.fit(lowest, location.getY(), highest);
-		return new Vector(location.getX(), newY, location.getZ());
+        return location.toVector();
 	}
 
 }