Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2025-02-03 22:11:32 +01:00
Code Issues Projects Releases Wiki Activity

Add an option in SafeSpotTeleport to cancel if fail (#1952)

Browse Source 
There was no option to cancel teleportation if SafeSpotTeleport could not find a valid spot. This option could be used to avoid creating "backup" blocks in situations when teleportation is avoidable, f.e. visiting an island.
This commit is contained in:
BONNe 2022-03-19 16:22:03 +02:00 committed by GitHub
parent 4e8ca6d22c
commit 3ba6620e73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,6 +51,7 @@ public class SafeSpotTeleport {
private final AtomicBoolean checking = new AtomicBoolean(); private final AtomicBoolean checking = new AtomicBoolean();
private BukkitTask task; private BukkitTask task;
private boolean portal; private boolean portal;
private boolean cancelIfFail;
// Locations // Locations
private Location bestSpot; private Location bestSpot;
private Iterator<Pair<Integer, Integer>> chunksToScanIterator; private Iterator<Pair<Integer, Integer>> chunksToScanIterator;
@ -73,6 +74,7 @@ public class SafeSpotTeleport {
this.result = builder.getResult(); this.result = builder.getResult();
this.world = Objects.requireNonNull(location.getWorld()); this.world = Objects.requireNonNull(location.getWorld());
this.maxHeight = world.getMaxHeight() - 20; this.maxHeight = world.getMaxHeight() - 20;
this.cancelIfFail = builder.isCancelIfFail();
// Try to go // Try to go
Util.getChunkAtAsync(location).thenRun(() -> tryToGo(builder.getFailureMessage())); Util.getChunkAtAsync(location).thenRun(() -> tryToGo(builder.getFailureMessage()));
} }
@ -150,7 +152,7 @@ public class SafeSpotTeleport {
if (!plugin.getIWM().inWorld(entity.getLocation())) { if (!plugin.getIWM().inWorld(entity.getLocation())) {
// Last resort // Last resort
player.performCommand("spawn"); player.performCommand("spawn");
} else { } else if (!this.cancelIfFail) {
// Create a spot for the player to be // Create a spot for the player to be
if (world.getEnvironment().equals(Environment.NETHER)) { if (world.getEnvironment().equals(Environment.NETHER)) {
makeAndTeleport(Material.NETHERRACK); makeAndTeleport(Material.NETHERRACK);
@ -336,6 +338,7 @@ public class SafeSpotTeleport {
private Location location; private Location location;
private Runnable runnable; private Runnable runnable;
private Runnable failRunnable; private Runnable failRunnable;
private boolean cancelIfFail;
public Builder(BentoBox plugin) { public Builder(BentoBox plugin) {
this.plugin = plugin; this.plugin = plugin;
@ -461,6 +464,20 @@ public class SafeSpotTeleport {
return new SafeSpotTeleport(this); return new SafeSpotTeleport(this);
} }
/**
* This method allows stopping "safe" block generation if teleportation fails.
* @param cancelIfFail - value for canceling
* @return Builder
* @since 1.20.1
*/
public Builder cancelIfFail(boolean cancelIfFail)
{
this.cancelIfFail = cancelIfFail;
return this;
}
/** /**
* The task to run after the player is safely teleported. * The task to run after the player is safely teleported.
* *
@ -557,5 +574,13 @@ public class SafeSpotTeleport {
} }
/**
* @return the cancelIfFail
* @since 1.20.1
*/
public boolean isCancelIfFail()
{
return this.cancelIfFail;
}
} }
} }