Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2024-11-22 18:26:08 +01:00
Code Issues Projects Releases Wiki Activity

Fix updateallislands command

Browse Source
This commit is contained in:
Fabrizio La Rosa 2020-07-30 22:05:51 +02:00
parent f8323af0b7
commit d0ece124fa
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/songoda/skyblock/command/commands/admin/UpdateAllIslandsCommand.java
View File

@ -78,7 +78,7 @@ public class UpdateAllIslandsCommand extends SubCommand {
@Override
public String getName() {
return "updateallIslands";
return "updateallislands";
}
@Override

25
src/main/java/com/songoda/skyblock/island/IslandManager.java
View File

@ -60,10 +60,8 @@ import javax.annotation.Nullable;
import java.io.File;
import java.io.IOException;
import java.util.*;
import java.util.concurrent.Callable;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Consumer;
import java.util.stream.Collectors;
public class IslandManager {
@ -758,19 +756,16 @@ public class IslandManager {
for (File file : files) {
if (file != null && file.getName().contains(".yml") && file.getName().length() > 35) {
try {
Config config = new FileManager.Config(fileManager, file);
FileConfiguration islandConfigLoad = config.getFileConfiguration();
UUID islandOwnerUUID = FastUUID.parseUUID(islandConfigLoad.getString("Island.Owner", ""));
UUID islandOwnerUUID = FastUUID.parseUUID(file.getName().split("\\.")[0]);
Island island = getIslandByUUID(islandOwnerUUID);
Island island = getIslandByPlayer(Bukkit.getOfflinePlayer(islandOwnerUUID));
if(island != null) {
island.setSize(island.getSize() + diff);
island.save();
} else {
loadIsland(file);
island = getIslandByUUID(islandOwnerUUID);
island = getIslandByPlayer(Bukkit.getOfflinePlayer(islandOwnerUUID));
island.setSize(island.getSize() + diff);
island.save();
@ -788,7 +783,6 @@ public class IslandManager {
}
public void setAllIslandsSize(@Nonnull int size, @Nullable Runnable callback) {
FileManager fileManager = plugin.getFileManager();
File islandConfigDir = new File(plugin.getDataFolder().toString() + "/island-data");
if (!islandConfigDir.exists()) return;
@ -799,19 +793,16 @@ public class IslandManager {
for (File file : files) {
if (file != null && file.getName().contains(".yml") && file.getName().length() > 35) {
try {
Config config = new FileManager.Config(fileManager, file);
FileConfiguration islandConfigLoad = config.getFileConfiguration();
UUID islandOwnerUUID = FastUUID.parseUUID(file.getName().split("\\.")[0]);
UUID islandOwnerUUID = FastUUID.parseUUID(islandConfigLoad.getString("Island.Owner", ""));
Island island = getIslandByUUID(islandOwnerUUID);
Island island = getIslandByPlayer(Bukkit.getOfflinePlayer(islandOwnerUUID));
if(island != null) {
island.setSize(size);
island.save();
} else {
loadIsland(file);
island = getIslandByUUID(islandOwnerUUID);
island = getIslandByPlayer(Bukkit.getOfflinePlayer(islandOwnerUUID));
island.setSize(size);
island.save();
@ -835,8 +826,8 @@ public class IslandManager {
Config config = fileManager.getConfig(islandFile);
FileConfiguration configLoad = config.getFileConfiguration();
UUID islandOwnerUUID = FastUUID.parseUUID(configLoad.getString("Island.Owner", ""));
UUID islandOwnerUUID = FastUUID.parseUUID(islandFile.getName().split("\\.")[0]);
if (config.getFileConfiguration().getString("Location") == null) {
deleteIslandData(islandOwnerUUID);