Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2025-03-12 06:32:16 +01:00
Code Issues Projects Releases Wiki Activity

Fixed parsing incorrect weather.

Browse Source
This commit is contained in:
Wertík 2020-03-31 17:39:27 +02:00 committed by Brianna
parent 32f5383f3e
commit 4aafc87b55
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/com/songoda/skyblock/island/Island.java
View File

@ -134,14 +134,14 @@ public class Island {
Config settingsDataConfig = null;
File settingDataFile = new File(skyblock.getDataFolder().toString() + "/setting-data", getOwnerUUID().toString() + ".yml");
if (fileManager.isFileExist(settingDataFile)) {
settingsDataConfig = fileManager.getConfig(settingDataFile);
}
for (IslandRole roleList : IslandRole.getRoles()) {
List<IslandSetting> settings = new ArrayList<>();
for (String settingList : defaultSettingsConfig.getFileConfiguration().getConfigurationSection("Settings." + roleList.name()).getKeys(false)) {
if (settingsDataConfig == null || settingsDataConfig.getFileConfiguration().getString("Settings." + roleList.name() + "." + settingList) == null) {
settings.add(
@ -353,17 +353,17 @@ public class Island {
public boolean isInBorder(Location blockLocation) {
WorldManager worldManager = skyblock.getWorldManager();
if(!isBorder()) {
if (!isBorder()) {
return true;
}
Location islandLocation = getLocation(worldManager.getIslandWorld(blockLocation.getWorld()), IslandEnvironment.Island);
double halfSize = Math.floor(getRadius());
if(blockLocation.getBlockX() > (islandLocation.getBlockX()+halfSize)
|| blockLocation.getBlockX() < (islandLocation.getBlockX()-halfSize-1)
|| blockLocation.getBlockZ() > (islandLocation.getBlockZ()+halfSize)
|| blockLocation.getBlockZ() < (islandLocation.getBlockZ()-halfSize-1)) {
if (blockLocation.getBlockX() > (islandLocation.getBlockX() + halfSize)
|| blockLocation.getBlockX() < (islandLocation.getBlockX() - halfSize - 1)
|| blockLocation.getBlockZ() > (islandLocation.getBlockZ() + halfSize)
|| blockLocation.getBlockZ() < (islandLocation.getBlockZ() - halfSize - 1)) {
return false;
}
@ -413,10 +413,14 @@ public class Island {
WeatherType weatherType;
if (weatherTypeName == null || weatherTypeName.isEmpty() || WeatherType.valueOf(weatherTypeName) == null) {
if (weatherTypeName == null || weatherTypeName.isEmpty()) {
weatherType = WeatherType.CLEAR;
} else {
weatherType = WeatherType.valueOf(weatherTypeName);
try {
weatherType = WeatherType.valueOf(weatherTypeName);
} catch (IllegalArgumentException e) {
weatherType = WeatherType.CLEAR;
}
}
return weatherType;
@ -615,10 +619,10 @@ public class Island {
}
public boolean hasUpgrade(Upgrade.Type type) {
return skyblock.getFileManager().getConfig(
new File(new File(skyblock.getDataFolder().toString() + "/island-data"), ownerUUID.toString() + ".yml"))
.getFileConfiguration().getString("Upgrade." + type.name()) != null;
}
return skyblock.getFileManager().getConfig(
new File(new File(skyblock.getDataFolder().toString() + "/island-data"), ownerUUID.toString() + ".yml"))
.getFileConfiguration().getString("Upgrade." + type.name()) != null;
}
public boolean isUpgrade(Upgrade.Type type) {
return skyblock.getFileManager().getConfig(
@ -735,8 +739,8 @@ public class Island {
}
public boolean hasStructure() {
return getStructure() != null;
}
return getStructure() != null;
}
public String getStructure() {
return skyblock.getFileManager().getConfig(
@ -775,13 +779,13 @@ public class Island {
Config config = fileManager
.getConfig(new File(skyblock.getDataFolder().toString() + "/island-data", ownerUUID.toString() + ".yml"));
try {
config.getFileConfiguration().save(config.getFile());
} catch (IOException e) {
e.printStackTrace();
}
config = fileManager
.getConfig(new File(skyblock.getDataFolder().toString() + "/setting-data", ownerUUID.toString() + ".yml"));
FileConfiguration configLoad = config.getFileConfiguration();