Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-11-01 00:10:40 +01:00
Code Issues Projects Releases Wiki Activity

better safe spot finder

Browse Source
This commit is contained in:
Huynh Tien 2021-12-16 08:58:41 +07:00
parent 2e6ef59040
commit 6f01310f92
1 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/main/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleport.java
View File

@ -230,17 +230,48 @@ public class SafeSpotTeleport {
* @return true if a safe spot was found * @return true if a safe spot was found
*/ */
private boolean scanChunk(ChunkSnapshot chunk) { private boolean scanChunk(ChunkSnapshot chunk) {
// Run through the chunk int startY = location.getBlockY();
for (int x = 0; x< 16; x++) { int minY = location.getWorld().getMinHeight() + 1;
int maxY = maxHeight;
// Check the safe spot at the current height
for (int x = 0; x < 16; x++) {
for (int z = 0; z < 16; z++) { for (int z = 0; z < 16; z++) {
// Work down from the entry point up if (minY >= startY && startY <= maxY && checkBlock(chunk, x, startY ,z)) {
for (int y = Math.min(chunk.getHighestBlockYAt(x, z), maxHeight); y >= 0; y--) {
if (checkBlock(chunk, x,y,z)) {
return true; return true;
} }
} // end y }
} //end z }
} // end x
// Expand the height up and down until a safe spot is found
int upperY = startY + 1;
int lowerY = startY - 1;
boolean checkUpper = upperY <= maxY;
boolean checkLower = lowerY >= minY;
while (checkUpper || checkLower) {
for (int x = 0; x < 16; x++) {
for (int z = 0; z < 16; z++) {
if (checkUpper && upperY <= maxY && checkBlock(chunk, x, upperY, z)) {
return true;
}
if (checkLower && lowerY >= minY && checkBlock(chunk, x, lowerY, z)) {
return true;
}
}
}
if (upperY > maxY) {
checkUpper = false;
} else {
upperY++;
}
if (lowerY < minY) {
checkLower = false;
} else {
lowerY--;
}
}
// We can't find a safe spot
return false; return false;
} }