1 files changed, 0 insertions, 57 deletions
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
index 712de076d..1e9013408 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
@@ -1,11 +1,8 @@
 package com.earth2me.essentials.protect;
 
-import com.earth2me.essentials.protect.data.IProtectedBlock;
-import com.mchange.v2.log.MLevel;
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.bukkit.entity.Player;
@@ -17,33 +14,12 @@ import org.bukkit.plugin.java.JavaPlugin;
 public class EssentialsProtect extends JavaPlugin implements IProtect
 {
 	private static final Logger LOGGER = Logger.getLogger("Minecraft");
-	private static com.mchange.v2.log.MLogger C3P0logger;
 	private final Map<ProtectConfig, Boolean> settingsBoolean = new EnumMap<ProtectConfig, Boolean>(ProtectConfig.class);
 	private final Map<ProtectConfig, String> settingsString = new EnumMap<ProtectConfig, String>(ProtectConfig.class);
 	private final Map<ProtectConfig, List<Integer>> settingsList = new EnumMap<ProtectConfig, List<Integer>>(ProtectConfig.class);
-	private IProtectedBlock storage = null;
 	private EssentialsConnect ess = null;
 
 	@Override
-	public void onLoad()
-	{
-		try
-		{
-			// Simple fix for the case that log4j is on the class path by another plugin
-			Class propertyConfiguratorClass = Class.forName("org.apache.log4j.PropertyConfigurator");
-			Properties properties = new Properties();
-			properties.load(this.getClass().getResourceAsStream("log4j.properties"));
-			propertyConfiguratorClass.getMethod("configure", Properties.class).invoke(null, properties);
-		}
-		catch (Exception ex)
-		{
-			//Ignore me, log4j not found on classloader.
-		}
-		C3P0logger = com.mchange.v2.log.MLog.getLogger(com.mchange.v2.c3p0.impl.AbstractPoolBackedDataSource.class);
-		C3P0logger.setLevel(MLevel.WARNING);
-	}
-
-	@Override
 	public void onEnable()
 	{
 		final PluginManager pm = this.getServer().getPluginManager();
@@ -55,9 +31,6 @@ public class EssentialsProtect extends JavaPlugin implements IProtect
 		}
 		ess = new EssentialsConnect(essPlugin, this);
 
-		final EssentialsProtectPlayerListener playerListener = new EssentialsProtectPlayerListener(this);
-		pm.registerEvents(playerListener, this);
-
 		final EssentialsProtectBlockListener blockListener = new EssentialsProtectBlockListener(this);
 		pm.registerEvents(blockListener, this);
 
@@ -81,18 +54,6 @@ public class EssentialsProtect extends JavaPlugin implements IProtect
 	}
 
 	@Override
-	public IProtectedBlock getStorage()
-	{
-		return storage;
-	}
-
-	@Override
-	public void setStorage(IProtectedBlock pb)
-	{
-		storage = pb;
-	}
-
-	@Override
 	public EssentialsConnect getEssentialsConnect()
 	{
 		return ess;
@@ -129,22 +90,4 @@ public class EssentialsProtect extends JavaPlugin implements IProtect
 		final String str = settingsString.get(protectConfig);
 		return str == null ? protectConfig.getDefaultValueString() : str;
 	}
-
-	@Override
-	public void onDisable()
-	{
-		if (storage != null)
-		{
-			storage.onPluginDeactivation();
-		}
-		// Sleep for a second to allow the database to close.
-		try
-		{
-			Thread.sleep(1000);
-		}
-		catch (InterruptedException ex)
-		{
-			Logger.getLogger(EssentialsProtect.class.getName()).log(Level.SEVERE, null, ex);
-		}	
-	}
 }