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

Fix issue with WorldScanner where no chunks match exact dist squared

Browse Source
This commit is contained in:
Brady 2018-09-20 11:35:36 -05:00
parent 454bc9c628
commit d0fd370d53
No known key found for this signature in database
GPG Key ID: 73A788379A197567
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/baritone/cache/WorldScanner.java vendored
View File

@ -50,12 +50,14 @@ public enum WorldScanner implements Helper {
boolean foundWithinY = false; boolean foundWithinY = false;
while (true) { while (true) {
boolean allUnloaded = true; boolean allUnloaded = true;
boolean foundChunks = false;
for (int xoff = -searchRadiusSq; xoff <= searchRadiusSq; xoff++) { for (int xoff = -searchRadiusSq; xoff <= searchRadiusSq; xoff++) {
for (int zoff = -searchRadiusSq; zoff <= searchRadiusSq; zoff++) { for (int zoff = -searchRadiusSq; zoff <= searchRadiusSq; zoff++) {
int distance = xoff * xoff + zoff * zoff; int distance = xoff * xoff + zoff * zoff;
if (distance != searchRadiusSq) { if (distance != searchRadiusSq) {
continue; continue;
} }
foundChunks = true;
int chunkX = xoff + playerChunkX; int chunkX = xoff + playerChunkX;
int chunkZ = zoff + playerChunkZ; int chunkZ = zoff + playerChunkZ;
Chunk chunk = chunkProvider.getLoadedChunk(chunkX, chunkZ); Chunk chunk = chunkProvider.getLoadedChunk(chunkX, chunkZ);
@ -92,7 +94,7 @@ public enum WorldScanner implements Helper {
} }
} }
} }
if (allUnloaded) { if (allUnloaded && foundChunks) {
return res; return res;
} }
if (res.size() >= max && (searchRadiusSq > 26 || (searchRadiusSq > 1 && foundWithinY))) { if (res.size() >= max && (searchRadiusSq > 26 || (searchRadiusSq > 1 && foundWithinY))) {