Upstream
/
FabledSkyBlock
mirror of https://github.com/songoda/FabledSkyBlock.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

This commit is contained in:
Christian Koop 2021-12-10 20:20:22 +01:00
parent 35ec9d59f9 d53e0939d5
commit 17aeec7d75
No known key found for this signature in database
GPG Key ID: 89A8181384E010A3
4 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>com.songoda</groupId>
<artifactId>skyblock</artifactId>
<version>2.3.30</version>
<version>2.4.0</version>
<packaging>jar</packaging>
<properties>
@ -76,8 +76,7 @@
</goals>
<configuration>
<dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml
</dependencyReducedPomLocation>
<dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
<shadedArtifactAttached>false</shadedArtifactAttached>
<createDependencyReducedPom>false</createDependencyReducedPom>
<minimizeJar>true</minimizeJar>
@ -194,7 +193,8 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId>
<version>1.17</version>
<version>1.18</version>
<scope>provided</scope>
</dependency>
<dependency>
@ -207,7 +207,7 @@
<dependency>
<groupId>com.songoda</groupId>
<artifactId>SongodaCore</artifactId>
<version>LATEST</version>
<version>2.6.5</version>
<scope>compile</scope>
</dependency>

2
src/main/java/com/songoda/skyblock/SkyBlock.java
View File

@ -129,7 +129,7 @@ public class SkyBlock extends SongodaPlugin {
@Override
public void onPluginEnable() {
if (ServerVersion.isServerVersionAbove(ServerVersion.V1_17) || ServerVersion.isServerVersionBelow(ServerVersion.V1_8)) {
if (ServerVersion.isServerVersionAbove(ServerVersion.V1_18) || ServerVersion.isServerVersionBelow(ServerVersion.V1_8)) {
this.getLogger().warning("This Minecraft version is not officially supported.");
}

12
src/main/java/com/songoda/skyblock/gui/biome/GuiBiome.java
View File

@ -18,7 +18,6 @@ import com.songoda.skyblock.island.IslandManager;
import com.songoda.skyblock.island.IslandWorld;
import com.songoda.skyblock.message.MessageManager;
import com.songoda.skyblock.sound.SoundManager;
import com.songoda.core.utils.NumberUtils;
import com.songoda.skyblock.utils.NumberUtil;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.FileConfiguration;
@ -88,14 +87,9 @@ public class GuiBiome extends Gui {
}
List<BiomeIcon> biomes = new ArrayList<>();
for(CompatibleBiome biome : CompatibleBiome.getCompatibleBiomes()) {
if(biome.isCompatible()){
try { // Hotfix for core misconfiguration
biome.getBiome();
} catch (IllegalArgumentException ex) {
continue;
}
BiomeIcon icon = new BiomeIcon(plugin, biome);
for (CompatibleBiome biome : CompatibleBiome.getCompatibleBiomes()) {
if (biome.isCompatible()) {
BiomeIcon icon = new BiomeIcon(plugin, biome);
if (icon.biome != null &&
(!icon.permission ||
player.hasPermission("fabledskyblock.biome." + biome.name().toLowerCase()))) {

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

@ -896,7 +896,7 @@ public class IslandManager {
public void loadIslandAtLocation(Location location) {
FileManager fileManager = plugin.getFileManager();
File configFile = new File(plugin.getDataFolder().toString() + "/island-data");
File configFile = new File(plugin.getDataFolder(), "island-data");
if (!configFile.exists()) return;