From 0ef80b465fe281e6d5cc1d75817598005ca3db67 Mon Sep 17 00:00:00 2001 From: Brianna Date: Sun, 1 Sep 2019 12:51:16 -0400 Subject: [PATCH] Better island deletion. --- .../command/commands/admin/ProxyCommand.java | 1 - .../com/songoda/skyblock/island/IslandManager.java | 12 +++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/FabledSkyBlock/Core/src/main/java/com/songoda/skyblock/command/commands/admin/ProxyCommand.java b/FabledSkyBlock/Core/src/main/java/com/songoda/skyblock/command/commands/admin/ProxyCommand.java index e6056e90..df402076 100644 --- a/FabledSkyBlock/Core/src/main/java/com/songoda/skyblock/command/commands/admin/ProxyCommand.java +++ b/FabledSkyBlock/Core/src/main/java/com/songoda/skyblock/command/commands/admin/ProxyCommand.java @@ -31,7 +31,6 @@ public class ProxyCommand extends SubCommand { } public void onCommand(CommandSender sender, String[] args) { - PlayerDataManager playerDataManager = skyblock.getPlayerDataManager(); MessageManager messageManager = skyblock.getMessageManager(); IslandManager islandManager = skyblock.getIslandManager(); SoundManager soundManager = skyblock.getSoundManager(); diff --git a/FabledSkyBlock/Core/src/main/java/com/songoda/skyblock/island/IslandManager.java b/FabledSkyBlock/Core/src/main/java/com/songoda/skyblock/island/IslandManager.java index 92b3a94a..419784b2 100644 --- a/FabledSkyBlock/Core/src/main/java/com/songoda/skyblock/island/IslandManager.java +++ b/FabledSkyBlock/Core/src/main/java/com/songoda/skyblock/island/IslandManager.java @@ -391,11 +391,12 @@ public class IslandManager { WorldManager worldManager = skyblock.getWorldManager(); // Delete island from world. - Bukkit.getScheduler().runTask(skyblock, () -> { - for (IslandWorld worldList : IslandWorld.getIslandWorlds()) { + long i = 0; + for (IslandWorld worldList : IslandWorld.getIslandWorlds()) { + Bukkit.getScheduler().runTaskLater(skyblock, () -> { org.bukkit.World world = worldManager.getWorld(worldList); Location location = island.getLocation(worldList, IslandEnvironment.Island); - if (location == null) continue; + if (location == null) return; int size = island.getSize(); int xx = location.getBlockX() - size / 2; int zz = location.getBlockZ() - size / 2; @@ -406,8 +407,9 @@ public class IslandManager { } } } - } - }); + }, i); + i += 20L; + } skyblock.getVisitManager().deleteIsland(island.getOwnerUUID()); skyblock.getBanManager().deleteIsland(island.getOwnerUUID());