Skip to content

Commit

Permalink
Fixed errors about name cannot be null when creating islands
Browse files Browse the repository at this point in the history
  • Loading branch information
OmerBenGera committed Apr 13, 2023
1 parent 71f819e commit 0a91dbb
Showing 1 changed file with 7 additions and 4 deletions.
Expand Up @@ -13,6 +13,7 @@
import com.bgsoftware.superiorskyblock.island.builder.IslandBuilderImpl;
import com.google.common.base.Preconditions;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.block.BlockFace;

import java.util.UUID;
Expand Down Expand Up @@ -50,10 +51,10 @@ public CompletableFuture<IslandCreationResult> createIsland(UUID islandUUID, Sup
}

@Override
public CompletableFuture<IslandCreationResult> createIsland(Island.Builder builderParam, BlockPosition lastIsland) {
public CompletableFuture<IslandCreationResult> createIsland(Island.Builder builderParam, BlockPosition lastIslandPosition) {
Preconditions.checkNotNull(builderParam, "builder parameter cannot be null.");
Preconditions.checkArgument(builderParam instanceof IslandBuilderImpl, "Cannot create an island from custom builder.");
Preconditions.checkNotNull(lastIsland, "lastIsland parameter cannot be null.");
Preconditions.checkNotNull(lastIslandPosition, "lastIsland parameter cannot be null.");

IslandBuilderImpl builder = (IslandBuilderImpl) builderParam;

Expand All @@ -62,12 +63,14 @@ public CompletableFuture<IslandCreationResult> createIsland(Island.Builder build
Preconditions.checkArgument(builder.owner != null, "Cannot create an island from builder with no valid owner.");
Preconditions.checkArgument(schematic != null, "Cannot create an island from builder with invalid schematic name.");

Log.debug(Debug.CREATE_ISLAND, builder.owner.getName(), schematic.getName(), lastIsland);
Log.debug(Debug.CREATE_ISLAND, builder.owner.getName(), schematic.getName(), lastIslandPosition);

CompletableFuture<IslandCreationResult> completableFuture = new CompletableFuture<>();

World spawnWorld = plugin.getGrid().getSpawnIsland().getCenter(plugin.getSettings().getWorlds().getDefaultWorld()).getWorld();
Location lastIsland = new Location(spawnWorld, lastIslandPosition.getX(), lastIslandPosition.getY(), lastIslandPosition.getZ());
Location islandLocation = plugin.getProviders().getWorldsProvider().getNextLocation(
lastIsland.parse().clone(),
lastIsland,
plugin.getSettings().getIslandHeight(),
plugin.getSettings().getMaxIslandSize(),
builder.owner.getUniqueId(),
Expand Down

0 comments on commit 0a91dbb

Please sign in to comment.