diff --git a/src/main/java/net/knarcraft/stargate/Stargate.java b/src/main/java/net/knarcraft/stargate/Stargate.java index 8e1c68b..11c52df 100644 --- a/src/main/java/net/knarcraft/stargate/Stargate.java +++ b/src/main/java/net/knarcraft/stargate/Stargate.java @@ -207,7 +207,7 @@ public class Stargate extends JavaPlugin { * @param message
A message describing what happened
*/ public static void debug(String route, String message) { - if (stargateConfig == null || !stargateConfig.isLoaded() || stargateConfig.isDebuggingEnabled()) { + if (stargateConfig == null || stargateConfig.isNotLoaded() || stargateConfig.isDebuggingEnabled()) { logger.info("[Stargate::" + route + "] " + message); } else { logger.log(Level.FINEST, "[Stargate::" + route + "] " + message); @@ -220,7 +220,7 @@ public class Stargate extends JavaPlugin { * @param messageThe message to log
*/ public static void logInfo(String message) { - logger.info(getBackupString("prefix") + message); + log(Level.INFO, message); } /** @@ -251,7 +251,7 @@ public class Stargate extends JavaPlugin { if (logger == null) { logger = Bukkit.getLogger(); } - if (getInstance() == null) { + if (getInstance() == null || stargateConfig == null || stargateConfig.isNotLoaded()) { logger.log(severity, "[Stargate]: " + message); } else { logger.log(severity, getBackupString("prefix") + message); @@ -377,7 +377,9 @@ public class Stargate extends JavaPlugin { public void onDisable() { PortalHandler.closeAllPortals(); PortalRegistry.clearPortals(); - stargateConfig.clearManagedWorlds(); + if (stargateConfig != null) { + stargateConfig.clearManagedWorlds(); + } getServer().getScheduler().cancelTasks(this); } @@ -399,8 +401,17 @@ public class Stargate extends JavaPlugin { Server server = getServer(); stargate = this; - stargateConfig = new StargateConfig(logger); - stargateConfig.finishSetup(); + try { + stargateConfig = new StargateConfig(logger); + stargateConfig.finishSetup(); + } catch (NoClassDefFoundError exception) { + logSevere("Could not properly load. Class not found: " + + exception.getMessage() + "\nThis is probably because you are using CraftBukkit, or other outdated" + + "Minecraft server software. Minecraft server software based on Spigot or Paper is required. Paper" + + " is recommended, and can be downloaded at: https://papermc.io/downloads/paper"); + this.onDisable(); + return; + } pluginVersion = pluginDescriptionFile.getVersion(); diff --git a/src/main/java/net/knarcraft/stargate/config/LanguageLoader.java b/src/main/java/net/knarcraft/stargate/config/LanguageLoader.java index 0383794..ade33a0 100644 --- a/src/main/java/net/knarcraft/stargate/config/LanguageLoader.java +++ b/src/main/java/net/knarcraft/stargate/config/LanguageLoader.java @@ -45,7 +45,7 @@ public final class LanguageLoader { loadedBackupStrings = load("en", inputStream); } else { loadedBackupStrings = null; - Stargate.getConsoleLogger().severe("[stargate] Error loading backup language. " + + Stargate.logSevere("Error loading backup language. " + "There may be missing text in-game"); } } @@ -226,7 +226,7 @@ public final class LanguageLoader { strings = FileHelper.readKeyValuePairs(bufferedReader, "=", ColorConversion.NORMAL); } catch (Exception e) { if (Stargate.getStargateConfig().isDebuggingEnabled()) { - Stargate.getConsoleLogger().info("[Stargate] Unable to load language " + lang); + Stargate.logInfo("Unable to load language " + lang); } return null; } diff --git a/src/main/java/net/knarcraft/stargate/config/StargateConfig.java b/src/main/java/net/knarcraft/stargate/config/StargateConfig.java index 8d574bb..bb27d21 100644 --- a/src/main/java/net/knarcraft/stargate/config/StargateConfig.java +++ b/src/main/java/net/knarcraft/stargate/config/StargateConfig.java @@ -118,10 +118,10 @@ public final class StargateConfig { /** * Gets whether this configuration has been fully loaded * - * @returnTrue if fully loaded
+ * @returnTrue if not fully loaded
*/ - public boolean isLoaded() { - return this.isLoaded; + public boolean isNotLoaded() { + return !this.isLoaded; } /**