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

Merge branch 'development'

Browse Source
This commit is contained in:
Christian Koop 2021-12-10 20:20:22 +01:00
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> <groupId>com.songoda</groupId>
<artifactId>skyblock</artifactId> <artifactId>skyblock</artifactId>
<version>2.3.30</version> <version>2.4.0</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
@ -76,8 +76,7 @@
</goals> </goals>
<configuration> <configuration>
<dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
</dependencyReducedPomLocation>
<shadedArtifactAttached>false</shadedArtifactAttached> <shadedArtifactAttached>false</shadedArtifactAttached>
<createDependencyReducedPom>false</createDependencyReducedPom> <createDependencyReducedPom>false</createDependencyReducedPom>
<minimizeJar>true</minimizeJar> <minimizeJar>true</minimizeJar>
@ -194,7 +193,8 @@
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId> <artifactId>spigot</artifactId>
<version>1.17</version> <version>1.18</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -207,7 +207,7 @@
<dependency> <dependency>
<groupId>com.songoda</groupId> <groupId>com.songoda</groupId>
<artifactId>SongodaCore</artifactId> <artifactId>SongodaCore</artifactId>
<version>LATEST</version> <version>2.6.5</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>

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

@ -129,7 +129,7 @@ public class SkyBlock extends SongodaPlugin {
@Override @Override
public void onPluginEnable() { 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."); this.getLogger().warning("This Minecraft version is not officially supported.");
} }

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

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

@ -896,7 +896,7 @@ public class IslandManager {
public void loadIslandAtLocation(Location location) { public void loadIslandAtLocation(Location location) {
FileManager fileManager = plugin.getFileManager(); 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; if (!configFile.exists()) return;