From 34b63c06cc2a3e7ab25b69c047893c477ab500ba Mon Sep 17 00:00:00 2001 From: Wesley Wolfe Date: Sat, 23 Jun 2012 21:31:57 -0500 Subject: Add check for existing config file. Addresses BUKKIT-1851 --- src/main/java/org/bukkit/plugin/Plugin.java | 1 + src/main/java/org/bukkit/plugin/java/JavaPlugin.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java index 05a2c696..6b75c3e7 100644 --- a/src/main/java/org/bukkit/plugin/Plugin.java +++ b/src/main/java/org/bukkit/plugin/Plugin.java @@ -58,6 +58,7 @@ public interface Plugin extends CommandExecutor { /** * Saves the raw contents of the default config.yml file to the location retrievable by {@link #getConfig()}. * If there is no default config.yml embedded in the plugin, an empty config.yml file is saved. + * This should fail silently if the config.yml already exists. */ public void saveDefaultConfig(); diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java index b7ecc181..cdc6e751 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java @@ -133,7 +133,9 @@ public abstract class JavaPlugin extends PluginBase { } public void saveDefaultConfig() { - saveResource("config.yml", false); + if (!new File(getDataFolder(), "config.yml").exists()) { + saveResource("config.yml", false); + } } public void saveResource(String resourcePath, boolean replace) { -- cgit v1.2.3