From b94e100930a3838a72f4dae5449cc03b4ddf8a71 Mon Sep 17 00:00:00 2001 From: Bukkit/Spigot Date: Tue, 11 Oct 2011 15:50:59 +0100 Subject: [PATCH] Added reloadConfig() plugin method By: Nathan Adams --- .../main/java/org/bukkit/plugin/Plugin.java | 5 +++++ .../org/bukkit/plugin/java/JavaPlugin.java | 20 +++++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/paper-api/src/main/java/org/bukkit/plugin/Plugin.java b/paper-api/src/main/java/org/bukkit/plugin/Plugin.java index 3724429328..d9894c3852 100644 --- a/paper-api/src/main/java/org/bukkit/plugin/Plugin.java +++ b/paper-api/src/main/java/org/bukkit/plugin/Plugin.java @@ -58,6 +58,11 @@ public interface Plugin extends CommandExecutor { * Saves the {@link FileConfiguration} retrievable by {@link #getConfig()}. */ public void saveConfig(); + + /** + * Discards any data in {@link #getConfig()} and reloads from disk. + */ + public void reloadConfig(); /** * Gets the associated PluginLoader responsible for this plugin diff --git a/paper-api/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/paper-api/src/main/java/org/bukkit/plugin/java/JavaPlugin.java index f9966ac562..53d9a5a97e 100644 --- a/paper-api/src/main/java/org/bukkit/plugin/java/JavaPlugin.java +++ b/paper-api/src/main/java/org/bukkit/plugin/java/JavaPlugin.java @@ -120,18 +120,22 @@ public abstract class JavaPlugin implements Plugin { public FileConfiguration getConfig() { if (newConfig == null) { - newConfig = YamlConfiguration.loadConfiguration(configFile); - - InputStream defConfigStream = getResource("config.yml"); - if (defConfigStream != null) { - YamlConfiguration defConfig = YamlConfiguration.loadConfiguration(defConfigStream); - - newConfig.setDefaults(defConfig); - } + reloadConfig(); } return newConfig; } + public void reloadConfig() { + newConfig = YamlConfiguration.loadConfiguration(configFile); + + InputStream defConfigStream = getResource("config.yml"); + if (defConfigStream != null) { + YamlConfiguration defConfig = YamlConfiguration.loadConfiguration(defConfigStream); + + newConfig.setDefaults(defConfig); + } + } + public void saveConfig() { try { newConfig.save(configFile);