1 files changed, 53 insertions, 47 deletions

diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java
index 7503c334c..539ff208b 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java
@@ -1,13 +1,12 @@
 package com.earth2me.essentials.protect;
 
-import com.earth2me.essentials.IConf;
-import com.earth2me.essentials.IEssentials;
-import com.earth2me.essentials.User;
-import com.earth2me.essentials.protect.data.ProtectedBlockMemory;
+import static com.earth2me.essentials.I18n._;
+import com.earth2me.essentials.api.IEssentials;
+import com.earth2me.essentials.api.IReload;
+import com.earth2me.essentials.api.IUser;
 import com.earth2me.essentials.protect.data.ProtectedBlockMySQL;
 import com.earth2me.essentials.protect.data.ProtectedBlockSQLite;
 import java.beans.PropertyVetoException;
-import static com.earth2me.essentials.I18n._;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.bukkit.Location;
@@ -29,8 +28,9 @@ public class EssentialsConnect
 		}
 		ess = (IEssentials)essPlugin;
 		protect = (IProtect)essProtect;
+		protect.setSettings(new ProtectHolder(ess));
 		ProtectReloader pr = new ProtectReloader();
-		pr.reloadConfig();
+		pr.onReload();
 		ess.addReloadListener(pr);
 	}
 
@@ -43,7 +43,7 @@ public class EssentialsConnect
 		return ess;
 	}
 
-	public void alert(final User user, final String item, final String type)
+	public void alert(final Player user, final String item, final String type)
 	{
 		final Location loc = user.getLocation();
 		final String warnMessage = _("alertFormat", user.getName(), type, item,
@@ -52,8 +52,8 @@ public class EssentialsConnect
 		LOGGER.log(Level.WARNING, warnMessage);
 		for (Player p : ess.getServer().getOnlinePlayers())
 		{
-			final User alertUser = ess.getUser(p);
-			if (alertUser.isAuthorized("essentials.protect.alerts"))
+			final IUser alertUser = ess.getUser(p);
+			if (Permissions.ALERTS.isAuthorized(alertUser))
 			{
 				alertUser.sendMessage(warnMessage);
 			}
@@ -61,62 +61,68 @@ public class EssentialsConnect
 	}
 
 
-	private class ProtectReloader implements IConf
+	private class ProtectReloader implements IReload
 	{
 		@Override
-		public void reloadConfig()
+		public void onReload()
 		{
 			if (protect.getStorage() != null)
 			{
 				protect.getStorage().onPluginDeactivation();
 			}
-			for (ProtectConfig protectConfig : ProtectConfig.values())
-			{
-				if (protectConfig.isList())
-				{
-					protect.getSettingsList().put(protectConfig, ess.getSettings().getProtectList(protectConfig.getConfigName()));
-				}
-				else if (protectConfig.isString())
-				{
-					protect.getSettingsString().put(protectConfig, ess.getSettings().getProtectString(protectConfig.getConfigName()));
-				}
-				else
-				{
-					protect.getSettingsBoolean().put(protectConfig, ess.getSettings().getProtectBoolean(protectConfig.getConfigName(), protectConfig.getDefaultValueBoolean()));
-				}
 
-			}
+			/*
+			 * for (ProtectConfig protectConfig : ProtectConfig.values()) { if (protectConfig.isList()) {
+			 * protect.getSettingsList().put(protectConfig,
+			 * ess.getSettings().getProtectList(protectConfig.getConfigName())); } else if (protectConfig.isString()) {
+			 * protect.getSettingsString().put(protectConfig,
+			 * ess.getSettings().getProtectString(protectConfig.getConfigName())); } else {
+			 * protect.getSettingsBoolean().put(protectConfig,
+			 * ess.getSettings().getProtectBoolean(protectConfig.getConfigName(),
+			 * protectConfig.getDefaultValueBoolean())); }
+			 *
+			 * }
+			 */
 
-			if (protect.getSettingString(ProtectConfig.datatype).equalsIgnoreCase("mysql"))
+			ProtectHolder settings = protect.getSettings();
+			settings.acquireReadLock();
+			try
 			{
-				try
-				{
-					protect.setStorage(new ProtectedBlockMySQL(
-							protect.getSettingString(ProtectConfig.mysqlDB),
-							protect.getSettingString(ProtectConfig.dbUsername),
-							protect.getSettingString(ProtectConfig.dbPassword)));
-				}
-				catch (PropertyVetoException ex)
+				if (settings.getData().getDbtype().equalsIgnoreCase("mysql"))
 				{
-					LOGGER.log(Level.SEVERE, null, ex);
+					try
+					{
+						protect.setStorage(new ProtectedBlockMySQL(
+								settings.getData().getDburl(),
+								settings.getData().getDbuser(),
+								settings.getData().getDbpassword()));
+					}
+					catch (PropertyVetoException ex)
+					{
+						LOGGER.log(Level.SEVERE, null, ex);
+					}
 				}
-			}
-			else
-			{
-				try
+				else
 				{
-					protect.setStorage(new ProtectedBlockSQLite("jdbc:sqlite:plugins/Essentials/EssentialsProtect.db"));
+					try
+					{
+						protect.setStorage(new ProtectedBlockSQLite("jdbc:sqlite:plugins/Essentials/EssentialsProtect.db"));
+					}
+					catch (PropertyVetoException ex)
+					{
+						LOGGER.log(Level.SEVERE, null, ex);
+					}
 				}
-				catch (PropertyVetoException ex)
+				/*if (protect.getSettingBool(ProtectConfig.memstore))
 				{
-					LOGGER.log(Level.SEVERE, null, ex);
-				}
+					protect.setStorage(new ProtectedBlockMemory(protect.getStorage(), protect));
+				}*/
+
 			}
-			if (protect.getSettingBool(ProtectConfig.memstore))
+			finally
 			{
-				protect.setStorage(new ProtectedBlockMemory(protect.getStorage(), protect));
+				settings.unlock();
 			}
-
 		}
 	}
 }