Fix scanner brush height logic & typos (#306)

IntellectualSites · Oct 4, 2023 · abe2026 · abe2026
1 parent c6ba7a2
commit abe2026
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/src/main/java/com/thevoxelbox/voxelsniper/brush/type/AbstractBrush.java b/src/main/java/com/thevoxelbox/voxelsniper/brush/type/AbstractBrush.java
@@ -109,7 +109,7 @@ public void perform(
     public int clampY(int y) {
         int clampedY = y;
         int minHeight = editSession.getMinY();
-        if (clampedY <= minHeight) {
+        if (clampedY < minHeight) {
             clampedY = minHeight;
         } else {
             int maxHeight = editSession.getMaxY();

diff --git a/src/main/java/com/thevoxelbox/voxelsniper/brush/type/ScannerBrush.java b/src/main/java/com/thevoxelbox/voxelsniper/brush/type/ScannerBrush.java
@@ -99,54 +99,49 @@ private void scan(Snipe snipe, Direction blockFace) {
         if (blockFace == Direction.NORTH) { // Scan south
             for (int i = 1; i < this.depth + 1; i++) {
                 if (getBlockType(targetBlock.getX(), clampY(targetBlock.getY()), targetBlock.getZ() + i) == this.checkFor) {
-                    messenger.sendMessage(Caption.of("voxelsniper.brush.scanner.fond", this.checkFor.getId(), i));
+                    messenger.sendMessage(Caption.of("voxelsniper.brush.scanner.found", this.checkFor.getId(), i));
                     return;
                 }
             }
             messenger.sendMessage(Caption.of("voxelsniper.brush.scanner.not-found"));
         } else if (blockFace == Direction.SOUTH) { // Scan north
             for (int i = 1; i < this.depth + 1; i++) {
                 if (getBlockType(targetBlock.getX(), clampY(targetBlock.getY()), targetBlock.getZ() - i) == this.checkFor) {
-                    messenger.sendMessage(Caption.of("voxelsniper.brush.scanner.fond", this.checkFor.getId(), i));
+                    messenger.sendMessage(Caption.of("voxelsniper.brush.scanner.found", this.checkFor.getId(), i));
                     return;
                 }
             }
             messenger.sendMessage(Caption.of("voxelsniper.brush.scanner.not-found"));
         } else if (blockFace == Direction.EAST) { // Scan west
             for (int i = 1; i < this.depth + 1; i++) {
                 if (getBlockType(targetBlock.getX() - i, clampY(targetBlock.getY()), targetBlock.getZ()) == this.checkFor) {
-                    messenger.sendMessage(Caption.of("voxelsniper.brush.scanner.fond", this.checkFor.getId(), i));
+                    messenger.sendMessage(Caption.of("voxelsniper.brush.scanner.found", this.checkFor.getId(), i));
                     return;
                 }
             }
             messenger.sendMessage(Caption.of("voxelsniper.brush.scanner.not-found"));
         } else if (blockFace == Direction.WEST) { // Scan east
             for (int i = 1; i < this.depth + 1; i++) {
                 if (getBlockType(targetBlock.getX() + i, clampY(targetBlock.getY()), targetBlock.getZ()) == this.checkFor) {
-                    messenger.sendMessage(Caption.of("voxelsniper.brush.scanner.fond", this.checkFor.getId(), i));
+                    messenger.sendMessage(Caption.of("voxelsniper.brush.scanner.found", this.checkFor.getId(), i));
                     return;
                 }
             }
             messenger.sendMessage(Caption.of("voxelsniper.brush.scanner.not-found"));
         } else if (blockFace == Direction.UP) { // Scan down
-            for (int i = 1; i < this.depth + 1; i++) {
-                if ((targetBlock.getY() - i) <= getEditSession().getMinY()) {
-                    break;
-                }
+            EditSession editSession = getEditSession();
+            for (int i = 1; i < this.depth + 1 && targetBlock.getY() + i >= editSession.getMinY(); i++) {
                 if (getBlockType(targetBlock.getX(), clampY(targetBlock.getY() - i), targetBlock.getZ()) == this.checkFor) {
-                    messenger.sendMessage(Caption.of("voxelsniper.brush.scanner.fond", this.checkFor.getId(), i));
+                    messenger.sendMessage(Caption.of("voxelsniper.brush.scanner.found", this.checkFor.getId(), i));
                     return;
                 }
             }
             messenger.sendMessage(Caption.of("voxelsniper.brush.scanner.not-found"));
         } else if (blockFace == Direction.DOWN) { // Scan up
-            for (int i = 1; i < this.depth + 1; i++) {
-                EditSession editSession = getEditSession();
-                if ((targetBlock.getY() + i) >= editSession.getMaxY()) {
-                    break;
-                }
+            EditSession editSession = getEditSession();
+            for (int i = 1; i < this.depth + 1 && targetBlock.getY() + i <= editSession.getMaxY(); i++) {
                 if (getBlockType(targetBlock.getX(), clampY(targetBlock.getY() + i), targetBlock.getZ()) == this.checkFor) {
-                    messenger.sendMessage(Caption.of("voxelsniper.brush.scanner.fond", this.checkFor.getId(), i));
+                    messenger.sendMessage(Caption.of("voxelsniper.brush.scanner.found", this.checkFor.getId(), i));
                     return;
                 }
             }