If a trace hits the world limit, cancel it (#1942)

EngineHub · Nov 21, 2021 · 29f1c66 · 29f1c66
1 parent c407471
commit 29f1c66
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/TargetBlock.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/TargetBlock.java
@@ -143,18 +143,15 @@ private void setValues(Vector3 loc, double rotationX, double rotationY, int maxD
      * @return Block
      */
     public Location getAnyTargetBlock() {
-        boolean searchForLastBlock = true;
         Location lastBlock = null;
         while (getNextBlock() != null) {
             if (stopMask.test(targetPos)) {
                 break;
             } else {
-                if (searchForLastBlock) {
-                    lastBlock = getCurrentBlock();
-                    if (lastBlock.getBlockY() <= world.getMinY()
-                        || lastBlock.getBlockY() >= world.getMaxY()) {
-                        searchForLastBlock = false;
-                    }
+                lastBlock = getCurrentBlock();
+                if (lastBlock.getBlockY() < world.getMinY()
+                    || lastBlock.getBlockY() > world.getMaxY()) {
+                    return null;
                 }
             }
         }