Upstream/RandomTeleport
1
0
Fork 0
mirror of https://github.com/Phoenix616/RandomTeleport.git synced 2024-11-10 20:59:35 +01:00
Code Issues Projects Releases Wiki Activity

Fix issues with very small ranges and fix only corners getting found

Browse Source 
This also makes the max-range inclusive instead of exclusive as that makes more sense. Previously a searcher with max range of 1 would not find a new coordinate, it should find one at least one block next to it.
This commit is contained in:
Phoenix616 2019-04-27 01:32:17 +01:00
parent 8a17bfc000
commit ce3ad0e0fa
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
randomteleport-plugin/src/main/java/de/themoep/randomteleport/searcher/RandomSearcher.java
View File

@ -279,11 +279,9 @@ public class RandomSearcher {
Location randomLoc = center.clone(); Location randomLoc = center.clone();
randomLoc.setY(0); randomLoc.setY(0);
do { do {
randomLoc.setX(center.getBlockX() + (random.nextBoolean() ? 1 : -1) * random.nextInt(maxRadius)); randomLoc.setX(center.getBlockX() + (random.nextBoolean() ? 1 : -1) * (random.nextInt(maxRadius + 1)));
} while (!inRange(randomLoc.getBlockX(), center.getBlockX())); randomLoc.setZ(center.getBlockZ() + (random.nextBoolean() ? 1 : -1) * (random.nextInt(maxRadius + 1)));
do { } while (!inRadius(randomLoc));
randomLoc.setZ(center.getBlockZ() + (random.nextBoolean() ? 1 : -1) * random.nextInt(maxRadius));
} while (!inRange(randomLoc.getBlockZ(), center.getBlockZ()));
randomLoc.setX((randomLoc.getBlockX() >> 4) * 16); randomLoc.setX((randomLoc.getBlockX() >> 4) * 16);
randomLoc.setZ((randomLoc.getBlockZ() >> 4) * 16); randomLoc.setZ((randomLoc.getBlockZ() >> 4) * 16);
PaperLib.getChunkAtAsync(randomLoc, generatedOnly).thenApply(c -> { PaperLib.getChunkAtAsync(randomLoc, generatedOnly).thenApply(c -> {
@ -322,13 +320,10 @@ public class RandomSearcher {
} }
private boolean inRadius(Location location) { private boolean inRadius(Location location) {
return inRange(location.getBlockX(), center.getBlockX()) int diffX = Math.abs(location.getBlockX() - center.getBlockX());
|| inRange(location.getBlockZ(), center.getBlockZ()) ; int diffZ = Math.abs(location.getBlockZ() - center.getBlockZ());
} return diffX >= minRadius && diffX <= maxRadius && diffZ <= maxRadius
|| diffZ >= minRadius && diffZ <= maxRadius && diffX <= maxRadius;
private boolean inRange(int coord, int check) {
int diff = Math.abs(check - coord);
return diff >= minRadius && diff < maxRadius;
} }
public RandomTeleport getPlugin() { public RandomTeleport getPlugin() {