diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/RPGRegions.java b/rpgregions/src/main/java/net/islandearth/rpgregions/RPGRegions.java index 874f6a8..b19e252 100644 --- a/rpgregions/src/main/java/net/islandearth/rpgregions/RPGRegions.java +++ b/rpgregions/src/main/java/net/islandearth/rpgregions/RPGRegions.java @@ -143,7 +143,7 @@ public final class RPGRegions extends JavaPlugin implements IRPGRegionsAPI { @Override public void onDisable() { - translator.close(); + if (translator != null) translator.close(); if (managers == null || managers.getRegionsCache() == null || managers.getStorageManager() == null) { getLogger().warning("Unable to save data as managers were null"); @@ -185,16 +185,12 @@ public final class RPGRegions extends JavaPlugin implements IRPGRegionsAPI { private void createConfig() { saveDefaultConfig(); // Moved to config.yml - final File setupFile = firstTimeSetupFile(); - firstTimeSetup = !setupFile.exists(); - try { - setupFile.createNewFile(); - } catch (IOException e) { - throw new RuntimeException(e); - } - saveResource("integrations/lands.yml", false); saveResource("integrations/custom-structures.yml", false); + + final File setupFile = firstTimeSetupFile(); + firstTimeSetup = !setupFile.exists(); + setupFile.mkdirs(); } public File firstTimeSetupFile() { diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/commands/Commands.java b/rpgregions/src/main/java/net/islandearth/rpgregions/commands/Commands.java index d772583..c420e17 100644 --- a/rpgregions/src/main/java/net/islandearth/rpgregions/commands/Commands.java +++ b/rpgregions/src/main/java/net/islandearth/rpgregions/commands/Commands.java @@ -52,7 +52,7 @@ public class Commands { } // Register Brigadier mappings - if (manager.hasCapability(CloudBukkitCapabilities.BRIGADIER)) { + if (manager.hasCapability(CloudBukkitCapabilities.NATIVE_BRIGADIER)) { manager.registerBrigadier(); } diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/listener/ConnectionListener.java b/rpgregions/src/main/java/net/islandearth/rpgregions/listener/ConnectionListener.java index 05c5980..0219724 100644 --- a/rpgregions/src/main/java/net/islandearth/rpgregions/listener/ConnectionListener.java +++ b/rpgregions/src/main/java/net/islandearth/rpgregions/listener/ConnectionListener.java @@ -32,7 +32,7 @@ public record ConnectionListener(RPGRegions plugin) implements Listener { return; } - if (plugin.isFirstTimeSetup() || plugin.getConfig().getBoolean("dev.always", true)) { + if (plugin.isFirstTimeSetup() /*|| plugin.getConfig().getBoolean("settings.dev.always", true)*/) { final MiniMessage miniMessage = plugin.miniMessage(); final Audience audience = plugin.adventure().player(player); // Don't know if this works with the programs used to remove this stuff @@ -62,10 +62,10 @@ public record ConnectionListener(RPGRegions plugin) implements Listener { audience.sendMessage(Component.text("Welcome to RPGRegions v" + plugin.getDescription().getVersion() + "!", NamedTextColor.GOLD)); audience.sendMessage(Component.text("The plugin is running in a development environment.", NamedTextColor.RED)); - if (!plugin.debug()) { - plugin.getConfig().set("settings.dev.debug", true); - plugin.markDebugDirty(); - } +// if (!plugin.debug()) { +// plugin.getConfig().set("settings.dev.debug", true); +// plugin.markDebugDirty(); +// } } }