Miko/baritone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix spiral

Browse Source
This commit is contained in:
Wagyourtail
2022-12-23 17:10:37 -07:00
parent 0b6088cd2d
commit 12b596e536
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/baritone/cache/FasterWorldScanner.java vendored
View File

@@ -105,24 +105,16 @@ public enum FasterWorldScanner implements IWorldScanner {
public List<ChunkPos> getChunkRange(int centerX, int centerZ, int chunkRadius) {
List<ChunkPos> chunks = new ArrayList<>();
// spiral out
int x = centerX;
int z = centerZ;
int dx = 0;
int dz = -1;
int t = Math.max(chunkRadius, 1);
int maxI = t * t;
for (int i = 0; i < maxI; i++) {
if ((-chunkRadius / 2 <= x) && (x <= chunkRadius / 2) && (-chunkRadius / 2 <= z) && (z <= chunkRadius / 2)) {
chunks.add(new ChunkPos(x, z));
chunks.add(new ChunkPos(centerX, centerZ));
for (int i = 1; i < chunkRadius; i++) {
for (int x = centerX - i; x <= centerX + i; x++) {
chunks.add(new ChunkPos(x, centerZ - i));
chunks.add(new ChunkPos(x, centerZ + i));
}
// idk how this works, copilot did it
if ((x == z) || ((x < 0) && (x == -z)) || ((x > 0) && (x == 1 - z))) {
t = dx;
dx = -dz;
dz = t;
for (int z = centerZ - i + 1; z <= centerZ + i - 1; z++) {
chunks.add(new ChunkPos(centerX - i, z));
chunks.add(new ChunkPos(centerX + i, z));
}
x += dx;
z += dz;
}
return chunks;
}