summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Essentials/src/com/earth2me/essentials/Essentials.java10
-rw-r--r--EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java8
2 files changed, 15 insertions, 3 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index 40f68a6fd..879876572 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -187,6 +187,11 @@ public class Essentials extends JavaPlugin
{
iConf.reloadConfig();
}
+
+ for (User user : users.values())
+ {
+ user.reloadConfig();
+ }
try
{
@@ -644,4 +649,9 @@ public class Essentials extends JavaPlugin
{
return iConomyFallback;
}
+
+ public void addReloadListener(IConf listener)
+ {
+ confList.add(listener);
+ }
}
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
index 337b2c107..d1fbb786a 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
@@ -1,6 +1,7 @@
package com.earth2me.essentials.protect;
import com.earth2me.essentials.Essentials;
+import com.earth2me.essentials.IConf;
import com.earth2me.essentials.User;
import com.earth2me.essentials.Util;
import java.util.ArrayList;
@@ -16,7 +17,7 @@ import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin;
-public class EssentialsProtect extends JavaPlugin
+public class EssentialsProtect extends JavaPlugin implements IConf
{
private EssentialsProtectBlockListener blockListener = null;
private EssentialsProtectPlayerListener playerListener = null;
@@ -76,7 +77,8 @@ public class EssentialsProtect extends JavaPlugin
//serverlistener
pm.registerEvent(Type.PLUGIN_ENABLE, serverListener, Priority.Highest, this);
- loadSettings();
+ reloadConfig();
+ Essentials.getStatic().addReloadListener(this);
if (!this.getDescription().getVersion().equals(Essentials.getStatic().getDescription().getVersion())) {
logger.log(Level.WARNING, Util.i18n("versionMismatchAll"));
}
@@ -108,7 +110,7 @@ public class EssentialsProtect extends JavaPlugin
onBreakAlert = null;
}
- public static void loadSettings()
+ public void reloadConfig()
{
dataSettings = Essentials.getStatic().getSettings().getEpDBSettings();
genSettings = Essentials.getStatic().getSettings().getEpSettings();