From 984c8ec90d58cd7b8cf0bf7f2054865430f61bf8 Mon Sep 17 00:00:00 2001
From: Nathan Adams <dinnerbone@dinnerbone.com>
Date: Tue, 11 Oct 2011 15:50:59 +0100
Subject: Added reloadConfig() plugin method

---
 src/main/java/org/bukkit/plugin/Plugin.java          |  5 +++++
 src/main/java/org/bukkit/plugin/java/JavaPlugin.java | 20 ++++++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java
index 37244293..d9894c38 100644
--- a/src/main/java/org/bukkit/plugin/Plugin.java
+++ b/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/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
index f9966ac5..53d9a5a9 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
+++ b/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);
-- 
cgit v1.2.3