From 98a748afb3340ad979a09a62623ddefcdb2d7887 Mon Sep 17 00:00:00 2001
From: Wagyourtail <wagyourtail@wagyourtail.xyz>
Date: Tue, 27 Dec 2022 22:42:38 -0700
Subject: [PATCH] fix stream limit. immutable's in BOML

---
 .../baritone/api/utils/BlockOptionalMeta.java |  8 ++++--
 .../api/utils/BlockOptionalMetaLookup.java    | 28 ++++++++++++-------
 .../baritone/cache/FasterWorldScanner.java    |  6 +++-
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/api/java/baritone/api/utils/BlockOptionalMeta.java b/src/api/java/baritone/api/utils/BlockOptionalMeta.java
index e86341816..e0f491fba 100644
--- a/src/api/java/baritone/api/utils/BlockOptionalMeta.java
+++ b/src/api/java/baritone/api/utils/BlockOptionalMeta.java
@@ -41,8 +41,8 @@ public final class BlockOptionalMeta {
     private final int meta;
     private final boolean noMeta;
     private final Set<IBlockState> blockstates;
-    private final ImmutableSet<Integer> stateHashes;
-    private final ImmutableSet<Integer> stackHashes;
+    private final Set<Integer> stateHashes;
+    private final Set<Integer> stackHashes;
     private static final Pattern pattern = Pattern.compile("^(.+?)(?::(\\d+))?$");
     private static final Map<Object, Object> normalizations;
 
@@ -319,4 +319,8 @@ public final class BlockOptionalMeta {
     public Set<IBlockState> getAllBlockStates() {
         return blockstates;
     }
+
+    public Set<Integer> stackHashes() {
+        return stackHashes;
+    }
 }
diff --git a/src/api/java/baritone/api/utils/BlockOptionalMetaLookup.java b/src/api/java/baritone/api/utils/BlockOptionalMetaLookup.java
index 8fb52fb52..6d236e90e 100644
--- a/src/api/java/baritone/api/utils/BlockOptionalMetaLookup.java
+++ b/src/api/java/baritone/api/utils/BlockOptionalMetaLookup.java
@@ -17,6 +17,7 @@
 
 package baritone.api.utils;
 
+import com.google.common.collect.ImmutableSet;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.ItemStack;
@@ -28,34 +29,41 @@ import java.util.Set;
 import java.util.stream.Stream;
 
 public class BlockOptionalMetaLookup {
-    private final Set<Block> blockSet = new HashSet<>();
-    private final Set<IBlockState> blockStateSet = new HashSet<>();
+    private final Set<Block> blockSet;
+    private final Set<IBlockState> blockStateSet;
     private final BlockOptionalMeta[] boms;
 
     public BlockOptionalMetaLookup(BlockOptionalMeta... boms) {
         this.boms = boms;
+        Set<Block> blocks = new HashSet<>();
+        Set<IBlockState> blockStates = new HashSet<>();
+        Set<Integer> stacks = new HashSet<>();
         for (BlockOptionalMeta bom : boms) {
-            blockSet.add(bom.getBlock());
-            blockStateSet.addAll(bom.getAllBlockStates());
+            blocks.add(bom.getBlock());
+            blockStates.addAll(bom.getAllBlockStates());
+            stacks.addAll(bom.stackHashes());
         }
+        this.blockSet = ImmutableSet.copyOf(blocks);
+        this.blockStateSet = ImmutableSet.copyOf(blockStates);
     }
 
     public BlockOptionalMetaLookup(Block... blocks) {
-        this.boms = Stream.of(blocks)
+        this(Stream.of(blocks)
                 .map(BlockOptionalMeta::new)
-                .toArray(BlockOptionalMeta[]::new);
+                .toArray(BlockOptionalMeta[]::new));
+
     }
 
     public BlockOptionalMetaLookup(List<Block> blocks) {
-        this.boms = blocks.stream()
+        this(blocks.stream()
                 .map(BlockOptionalMeta::new)
-                .toArray(BlockOptionalMeta[]::new);
+                .toArray(BlockOptionalMeta[]::new));
     }
 
     public BlockOptionalMetaLookup(String... blocks) {
-        this.boms = Stream.of(blocks)
+        this(Stream.of(blocks)
                 .map(BlockOptionalMeta::new)
-                .toArray(BlockOptionalMeta[]::new);
+                .toArray(BlockOptionalMeta[]::new));
     }
 
     public boolean has(Block block) {
diff --git a/src/main/java/baritone/cache/FasterWorldScanner.java b/src/main/java/baritone/cache/FasterWorldScanner.java
index 4dd480f25..e133f0e49 100644
--- a/src/main/java/baritone/cache/FasterWorldScanner.java
+++ b/src/main/java/baritone/cache/FasterWorldScanner.java
@@ -55,7 +55,11 @@ public enum FasterWorldScanner implements IWorldScanner {
 
     @Override
     public List<BlockPos> scanChunk(IPlayerContext ctx, BlockOptionalMetaLookup filter, ChunkPos pos, int max, int yLevelThreshold) {
-        return scanChunkInternal(ctx, filter, pos).limit(max).collect(Collectors.toList());
+        Stream<BlockPos> stream = scanChunkInternal(ctx, filter, pos);
+        if (max >= 0) {
+            stream = stream.limit(max);
+        }
+        return stream.collect(Collectors.toList());
     }
 
     @Override