mirror of
https://github.com/BentoBoxWorld/BentoBox.git
synced 2025-01-09 18:08:27 +01:00
Simplified newIsland method in preparation for additional user cleaning
This commit is contained in:
tastybento
parent
dcbc1c1839
commit
065ddfb93f
@ -1,6 +1,7 @@
|
||||
package world.bentobox.bentobox.managers.island;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Optional;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
@ -167,47 +168,10 @@ public class NewIsland {
|
||||
* @throws IOException - if an island cannot be made. Message is the tag to show the user.
|
||||
*/
|
||||
public void newIsland(Island oldIsland) throws IOException {
|
||||
Location next = null;
|
||||
if (plugin.getIslands().hasIsland(world, user)) {
|
||||
// Island exists, it just needs pasting
|
||||
island = plugin.getIslands().getIsland(world, user);
|
||||
if (island != null && island.isReserved()) {
|
||||
next = island.getCenter();
|
||||
// Clear the reservation
|
||||
island.setReserved(false);
|
||||
} else {
|
||||
// This should never happen unless we allow another way to paste over islands without reserving
|
||||
plugin.logError("New island for user " + user.getName() + " was not reserved!");
|
||||
}
|
||||
}
|
||||
// If the reservation fails, then we need to make a new island anyway
|
||||
if (next == null) {
|
||||
next = this.locationStrategy.getNextLocation(world);
|
||||
if (next == null) {
|
||||
plugin.logError("Failed to make island - no unoccupied spot found.");
|
||||
plugin.logError("If the world was imported, try multiple times until all unowned islands are known.");
|
||||
throw new IOException("commands.island.create.cannot-create-island");
|
||||
}
|
||||
// Add to the grid
|
||||
island = plugin.getIslands().createIsland(next, user.getUniqueId());
|
||||
if (island == null) {
|
||||
plugin.logError("Failed to make island! Island could not be added to the grid.");
|
||||
throw new IOException("commands.island.create.unable-create-island");
|
||||
}
|
||||
}
|
||||
// Clear any old home locations (they should be clear, but just in case)
|
||||
plugin.getPlayers().clearHomeLocations(world, user.getUniqueId());
|
||||
// Set home location
|
||||
plugin.getPlayers().setHomeLocation(user, new Location(next.getWorld(), next.getX() + 0.5D, next.getY(), next.getZ() + 0.5D), 1);
|
||||
// Reset deaths
|
||||
if (plugin.getIWM().isDeathsResetOnNewIsland(world)) {
|
||||
plugin.getPlayers().setDeaths(world, user.getUniqueId(), 0);
|
||||
}
|
||||
// Check if owner has a different range permission than the island size
|
||||
island.setProtectionRange(user.getPermissionValue(plugin.getIWM().getAddon(island.getWorld())
|
||||
.map(GameModeAddon::getPermissionPrefix).orElse("") + "island.range", island.getProtectionRange()));
|
||||
// Save the player so that if the server crashes weird things won't happen
|
||||
plugin.getPlayers().save(user.getUniqueId());
|
||||
// Find the new island location
|
||||
Location next = checkReservedIsland().orElse(makeNextIsland());
|
||||
// Clean up the user
|
||||
cleanUpUser(next);
|
||||
// Fire event
|
||||
IslandBaseEvent event = IslandEvent.builder()
|
||||
.involvedPlayer(user.getUniqueId())
|
||||
@ -232,43 +196,114 @@ public class NewIsland {
|
||||
break;
|
||||
}
|
||||
|
||||
// Task to run after creating the island
|
||||
Runnable task = () -> {
|
||||
// Set initial spawn point if one exists
|
||||
if (island.getSpawnPoint(Environment.NORMAL) != null) {
|
||||
plugin.getPlayers().setHomeLocation(user, island.getSpawnPoint(Environment.NORMAL), 1);
|
||||
}
|
||||
// Stop the player from falling or moving if they are
|
||||
if (user.isOnline()) {
|
||||
if (reason.equals(Reason.RESET) || (reason.equals(Reason.CREATE) && plugin.getIWM().isTeleportPlayerToIslandUponIslandCreation(world))) {
|
||||
user.getPlayer().setVelocity(new Vector(0, 0, 0));
|
||||
user.getPlayer().setFallDistance(0F);
|
||||
// Teleport player after this island is built
|
||||
plugin.getIslands().homeTeleportAsync(world, user.getPlayer(), true).thenRun(() -> tidyUp(oldIsland));
|
||||
return;
|
||||
} else {
|
||||
// let's send him a message so that he knows he can teleport to his island!
|
||||
user.sendMessage("commands.island.create.you-can-teleport-to-your-island");
|
||||
}
|
||||
} else {
|
||||
// Remove the player again to completely clear the data
|
||||
User.removePlayer(user.getPlayer());
|
||||
}
|
||||
tidyUp(oldIsland);
|
||||
};
|
||||
// Run task to run after creating the island in one tick if island is not being pasted
|
||||
if (noPaste) {
|
||||
Bukkit.getScheduler().runTask(plugin, task);
|
||||
Bukkit.getScheduler().runTask(plugin, () -> postCreationTask(oldIsland));
|
||||
} else {
|
||||
// Create islands
|
||||
plugin.getBlueprintsManager().paste(addon, island, name, task);
|
||||
// Create islands, then run task
|
||||
plugin.getBlueprintsManager().paste(addon, island, name, () -> postCreationTask(oldIsland));
|
||||
}
|
||||
// Set default settings
|
||||
island.setFlagsDefaults();
|
||||
// Register metrics
|
||||
plugin.getMetrics().ifPresent(BStats::increaseIslandsCreatedCount);
|
||||
// Save island
|
||||
plugin.getIslands().save(island);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tasks to run after the new island has been created
|
||||
* @param oldIsland - old island that will be deleted
|
||||
*/
|
||||
private void postCreationTask(Island oldIsland) {
|
||||
// Set initial spawn point if one exists
|
||||
if (island.getSpawnPoint(Environment.NORMAL) != null) {
|
||||
plugin.getPlayers().setHomeLocation(user, island.getSpawnPoint(Environment.NORMAL), 1);
|
||||
}
|
||||
// Stop the player from falling or moving if they are
|
||||
if (user.isOnline()) {
|
||||
if (reason.equals(Reason.RESET) || (reason.equals(Reason.CREATE) && plugin.getIWM().isTeleportPlayerToIslandUponIslandCreation(world))) {
|
||||
user.getPlayer().setVelocity(new Vector(0, 0, 0));
|
||||
user.getPlayer().setFallDistance(0F);
|
||||
// Teleport player after this island is built
|
||||
plugin.getIslands().homeTeleportAsync(world, user.getPlayer(), true).thenRun(() -> tidyUp(oldIsland));
|
||||
return;
|
||||
} else {
|
||||
// let's send him a message so that he knows he can teleport to his island!
|
||||
user.sendMessage("commands.island.create.you-can-teleport-to-your-island");
|
||||
}
|
||||
} else {
|
||||
// Remove the player again to completely clear the data
|
||||
User.removePlayer(user.getPlayer());
|
||||
}
|
||||
tidyUp(oldIsland);
|
||||
}
|
||||
|
||||
/**
|
||||
* Cleans up a user before moving them to a new island.
|
||||
* Removes any old home locations. Sets the next home location. Resets deaths.
|
||||
* Checks range permissions and saves the player to the database.
|
||||
* @param loc - the new island location
|
||||
*/
|
||||
private void cleanUpUser(Location loc) {
|
||||
// Clear any old home locations (they should be clear, but just in case)
|
||||
plugin.getPlayers().clearHomeLocations(world, user.getUniqueId());
|
||||
// Set home location
|
||||
plugin.getPlayers().setHomeLocation(user, new Location(loc.getWorld(), loc.getX() + 0.5D, loc.getY(), loc.getZ() + 0.5D), 1);
|
||||
// Reset deaths
|
||||
if (plugin.getIWM().isDeathsResetOnNewIsland(world)) {
|
||||
plugin.getPlayers().setDeaths(world, user.getUniqueId(), 0);
|
||||
}
|
||||
// Check if owner has a different range permission than the island size
|
||||
island.setProtectionRange(user.getPermissionValue(plugin.getIWM().getAddon(island.getWorld())
|
||||
.map(GameModeAddon::getPermissionPrefix).orElse("") + "island.range", island.getProtectionRange()));
|
||||
// Save the player so that if the server crashes weird things won't happen
|
||||
plugin.getPlayers().save(user.getUniqueId());
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the next island location and add it to the island grid
|
||||
* @return location of new island
|
||||
* @throws IOException - if there are no unoccupied spots or the island could not be added to the grid
|
||||
*/
|
||||
private Location makeNextIsland() throws IOException {
|
||||
// If the reservation fails, then we need to make a new island anyway
|
||||
Location next = this.locationStrategy.getNextLocation(world);
|
||||
if (next == null) {
|
||||
plugin.logError("Failed to make island - no unoccupied spot found.");
|
||||
plugin.logError("If the world was imported, try multiple times until all unowned islands are known.");
|
||||
throw new IOException("commands.island.create.cannot-create-island");
|
||||
}
|
||||
// Add to the grid
|
||||
island = plugin.getIslands().createIsland(next, user.getUniqueId());
|
||||
if (island == null) {
|
||||
plugin.logError("Failed to make island! Island could not be added to the grid.");
|
||||
throw new IOException("commands.island.create.unable-create-island");
|
||||
}
|
||||
return next;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the reserved island location
|
||||
* @return reserved island location, or Optional empty if none found
|
||||
*/
|
||||
private Optional<Location> checkReservedIsland() {
|
||||
Location next = null;
|
||||
if (plugin.getIslands().hasIsland(world, user)) {
|
||||
// Island exists, it just needs pasting
|
||||
island = plugin.getIslands().getIsland(world, user);
|
||||
if (island != null && island.isReserved()) {
|
||||
next = island.getCenter();
|
||||
// Clear the reservation
|
||||
island.setReserved(false);
|
||||
} else {
|
||||
// This should never happen unless we allow another way to paste over islands without reserving
|
||||
plugin.logError("New island for user " + user.getName() + " was not reserved!");
|
||||
}
|
||||
}
|
||||
return Optional.ofNullable(next);
|
||||
}
|
||||
|
||||
private void tidyUp(Island oldIsland) {
|
||||
// Delete old island
|
||||
if (oldIsland != null && !plugin.getSettings().isKeepPreviousIslandOnReset()) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user