[Breaking] Remove protect database functionality for protecting signs and rails.

- Removed config entries
- Removed c3p0 lib

6 files changed, 0 insertions, 988 deletions

diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/data/IProtectedBlock.java b/EssentialsProtect/src/com/earth2me/essentials/protect/data/IProtectedBlock.java
deleted file mode 100644
index 755baface..000000000
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/data/IProtectedBlock.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.earth2me.essentials.protect.data;
-
-import java.util.List;
-import org.bukkit.block.Block;
-
-
-public interface IProtectedBlock
-{
-	public void clearProtections();
-
-	public void importProtections(List<OwnedBlock> blocks);
-
-	public List<OwnedBlock> exportProtections();
-
-	public void protectBlock(Block block, String playerName);
-
-	public boolean isProtected(Block block, String playerName);
-
-	public List<String> getOwners(Block block);
-
-	public int unprotectBlock(Block block);
-
-	public void onPluginDeactivation();
-}
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/data/OwnedBlock.java b/EssentialsProtect/src/com/earth2me/essentials/protect/data/OwnedBlock.java
deleted file mode 100644
index dc28feae8..000000000
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/data/OwnedBlock.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.earth2me.essentials.protect.data;
-
-
-public class OwnedBlock
-{
-	final int x;
-	final int y;
-	final int z;
-	final String world;
-	final String playerName;
-
-	public OwnedBlock(int x, int y, int z, String world, String playerName)
-	{
-		this.x = x;
-		this.y = y;
-		this.z = z;
-		this.world = world;
-		this.playerName = playerName;
-	}
-}
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockJDBC.java b/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockJDBC.java
deleted file mode 100644
index 18bb19a48..000000000
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockJDBC.java
+++ /dev/null
@@ -1,426 +0,0 @@
-package com.earth2me.essentials.protect.data;

-

-import com.mchange.v2.c3p0.ComboPooledDataSource;

-import java.beans.PropertyVetoException;

-import java.sql.Connection;

-import java.sql.PreparedStatement;

-import java.sql.ResultSet;

-import java.sql.SQLException;

-import java.util.ArrayList;

-import java.util.List;

-import java.util.logging.Level;

-import java.util.logging.Logger;

-import org.bukkit.block.Block;

-

-

-public abstract class ProtectedBlockJDBC implements IProtectedBlock

-{

-	protected static final Logger LOGGER = Logger.getLogger("Minecraft");

-	protected final ComboPooledDataSource cpds;

-	protected abstract PreparedStatement getStatementCreateTable(Connection conn) throws SQLException;

-	protected abstract PreparedStatement getStatementUpdateFrom2_0Table(Connection conn) throws SQLException;

-	protected abstract PreparedStatement getStatementDeleteAll(Connection conn) throws SQLException;

-	protected abstract PreparedStatement getStatementInsert(Connection conn, String world, int x, int y, int z, String playerName) throws SQLException;

-	protected abstract PreparedStatement getStatementPlayerCountByLocation(Connection conn, String world, int x, int y, int z, String playerName) throws SQLException;

-	protected abstract PreparedStatement getStatementPlayersByLocation(Connection conn, String name, int x, int y, int z) throws SQLException;

-	protected abstract PreparedStatement getStatementDeleteByLocation(Connection conn, String world, int x, int y, int z) throws SQLException;

-	protected abstract PreparedStatement getStatementAllBlocks(Connection conn) throws SQLException;

-

-	public ProtectedBlockJDBC(String driver, String url) throws PropertyVetoException

-	{

-		this(driver, url, null, null);

-	}

-

-	public ProtectedBlockJDBC(String driver, String url, String username, String password) throws PropertyVetoException

-	{

-		cpds = new ComboPooledDataSource();

-		cpds.setDriverClass(driver);

-		cpds.setJdbcUrl(url);

-		if (username != null)

-		{

-			cpds.setUser(username);

-			cpds.setPassword(password);

-		}

-		cpds.setMaxStatements(20);

-		createAndConvertTable();

-	}

-

-	private void createAndConvertTable()

-	{

-		Connection conn = null;

-		PreparedStatement ps = null;

-		try

-		{

-			conn = cpds.getConnection();

-			ps = getStatementCreateTable(conn);

-			ps.execute();

-			ps.close();

-			ps = getStatementUpdateFrom2_0Table(conn);

-			ps.execute();

-		}

-		catch (SQLException ex)

-		{

-			LOGGER.log(Level.SEVERE, null, ex);

-		}

-		finally

-		{

-			if (ps != null)

-			{

-				try

-				{

-					ps.close();

-				}

-				catch (SQLException ex)

-				{

-					LOGGER.log(Level.SEVERE, null, ex);

-				}

-			}

-			if (conn != null)

-			{

-				try

-				{

-					conn.close();

-				}

-				catch (SQLException ex)

-				{

-					LOGGER.log(Level.SEVERE, null, ex);

-				}

-			}

-		}

-	}

-

-	@Override

-	public void clearProtections()

-	{

-		Connection conn = null;

-		PreparedStatement ps = null;

-		try

-		{

-			conn = cpds.getConnection();

-			ps = getStatementDeleteAll(conn);

-			ps.executeUpdate();

-		}

-		catch (SQLException ex)

-		{

-			LOGGER.log(Level.SEVERE, null, ex);

-		}

-		finally

-		{

-			if (ps != null)

-			{

-				try

-				{

-					ps.close();

-				}

-				catch (SQLException ex)

-				{

-					LOGGER.log(Level.SEVERE, null, ex);

-				}

-			}

-			if (conn != null)

-			{

-				try

-				{

-					conn.close();

-				}

-				catch (SQLException ex)

-				{

-					LOGGER.log(Level.SEVERE, null, ex);

-				}

-			}

-		}

-	}

-

-	@Override

-	public void importProtections(List<OwnedBlock> blocks)

-	{

-		for (OwnedBlock ownedBlock : blocks)

-		{

-			if (ownedBlock.playerName == null)

-			{

-				continue;

-			}

-			protectBlock(ownedBlock.world, ownedBlock.x, ownedBlock.y, ownedBlock.z, ownedBlock.playerName);

-		}

-	}

-

-	@Override

-	public List<OwnedBlock> exportProtections()

-	{

-		Connection conn = null;

-		PreparedStatement ps = null;

-		ResultSet rs = null;

-		List<OwnedBlock> blocks = new ArrayList<OwnedBlock>();

-		try

-		{

-			conn = cpds.getConnection();

-			ps = getStatementAllBlocks(conn);

-			rs = ps.executeQuery();

-			while (rs.next())

-			{

-				OwnedBlock ob = new OwnedBlock(

-						rs.getInt(2),

-						rs.getInt(3),

-						rs.getInt(4),

-						rs.getString(1),

-						rs.getString(5));

-				blocks.add(ob);

-			}

-			return blocks;

-		}

-		catch (SQLException ex)

-		{

-			LOGGER.log(Level.SEVERE, null, ex);

-			return blocks;

-		}

-		finally

-		{

-			if (rs != null)

-			{

-				try

-				{

-					rs.close();

-				}

-				catch (SQLException ex)

-				{

-					LOGGER.log(Level.SEVERE, null, ex);

-				}

-			}

-			if (ps != null)

-			{

-				try

-				{

-					ps.close();

-				}

-				catch (SQLException ex)

-				{

-					LOGGER.log(Level.SEVERE, null, ex);

-				}

-			}

-			if (conn != null)

-			{

-				try

-				{

-					conn.close();

-				}

-				catch (SQLException ex)

-				{

-					LOGGER.log(Level.SEVERE, null, ex);

-				}

-			}

-		}

-	}

-

-	@Override

-	public void protectBlock(Block block, String playerName)

-	{

-		protectBlock(block.getWorld().getName(), block.getX(), block.getY(), block.getZ(), playerName);

-	}

-

-	private void protectBlock(String world, int x, int y, int z, String playerName)

-	{

-		Connection conn = null;

-		PreparedStatement ps = null;

-		try

-		{

-			conn = cpds.getConnection();

-			ps = getStatementInsert(conn, world, x, y, z, playerName);

-			ps.executeUpdate();

-		}

-		catch (SQLException ex)

-		{

-			LOGGER.log(Level.SEVERE, null, ex);

-		}

-		finally

-		{

-			if (ps != null)

-			{

-				try

-				{

-					ps.close();

-				}

-				catch (SQLException ex)

-				{

-					LOGGER.log(Level.SEVERE, null, ex);

-				}

-			}

-			if (conn != null)

-			{

-				try

-				{

-					conn.close();

-				}

-				catch (SQLException ex)

-				{

-					LOGGER.log(Level.SEVERE, null, ex);

-				}

-			}

-		}

-	}

-

-	@Override

-	public boolean isProtected(Block block, String playerName)

-	{

-		Connection conn = null;

-		PreparedStatement ps = null;

-		ResultSet rs = null;

-		try

-		{

-			conn = cpds.getConnection();

-			ps = getStatementPlayerCountByLocation(conn, block.getWorld().getName(), block.getX(), block.getY(), block.getZ(), playerName);

-			rs = ps.executeQuery();

-			return rs.next() && rs.getInt(1) > 0 && rs.getInt(2) == 0;

-		}

-		catch (SQLException ex)

-		{

-			LOGGER.log(Level.SEVERE, null, ex);

-			return true;

-		}

-		finally

-		{

-			if (rs != null)

-			{

-				try

-				{

-					rs.close();

-				}

-				catch (SQLException ex)

-				{

-					LOGGER.log(Level.SEVERE, null, ex);

-				}

-			}

-			if (ps != null)

-			{

-				try

-				{

-					ps.close();

-				}

-				catch (SQLException ex)

-				{

-					LOGGER.log(Level.SEVERE, null, ex);

-				}

-			}

-			if (conn != null)

-			{

-				try

-				{

-					conn.close();

-				}

-				catch (SQLException ex)

-				{

-					LOGGER.log(Level.SEVERE, null, ex);

-				}

-			}

-		}

-	}

-

-	@Override

-	public List<String> getOwners(Block block)

-	{

-		Connection conn = null;

-		PreparedStatement ps = null;

-		ResultSet rs = null;

-		List<String> owners = new ArrayList<String>();

-		try

-		{

-			conn = cpds.getConnection();

-			ps = getStatementPlayersByLocation(conn, block.getWorld().getName(), block.getX(), block.getY(), block.getZ());

-			rs = ps.executeQuery();

-			while (rs.next())

-			{

-				owners.add(rs.getString(1));

-			}

-			return owners;

-		}

-		catch (SQLException ex)

-		{

-			LOGGER.log(Level.SEVERE, null, ex);

-			return owners;

-		}

-		finally

-		{

-			if (rs != null)

-			{

-				try

-				{

-					rs.close();

-				}

-				catch (SQLException ex)

-				{

-					LOGGER.log(Level.SEVERE, null, ex);

-				}

-			}

-			if (ps != null)

-			{

-				try

-				{

-					ps.close();

-				}

-				catch (SQLException ex)

-				{

-					LOGGER.log(Level.SEVERE, null, ex);

-				}

-			}

-			if (conn != null)

-			{

-				try

-				{

-					conn.close();

-				}

-				catch (SQLException ex)

-				{

-					LOGGER.log(Level.SEVERE, null, ex);

-				}

-			}

-		}

-	}

-

-	@Override

-	public int unprotectBlock(Block block)

-	{

-		Connection conn = null;

-		PreparedStatement ps = null;

-		try

-		{

-			conn = cpds.getConnection();

-			ps = getStatementDeleteByLocation(conn, block.getWorld().getName(), block.getX(), block.getY(), block.getZ());

-			return ps.executeUpdate();

-		}

-		catch (SQLException ex)

-		{

-			LOGGER.log(Level.SEVERE, null, ex);

-			return 0;

-		}

-		finally

-		{

-			if (ps != null)

-			{

-				try

-				{

-					ps.close();

-				}

-				catch (SQLException ex)

-				{

-					LOGGER.log(Level.SEVERE, null, ex);

-				}

-			}

-			if (conn != null)

-			{

-				try

-				{

-					conn.close();

-				}

-				catch (SQLException ex)

-				{

-					LOGGER.log(Level.SEVERE, null, ex);

-				}

-			}

-		}

-	}

-

-	@Override

-	public void onPluginDeactivation()

-	{

-		cpds.close();

-	}

-}

diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockMemory.java b/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockMemory.java
deleted file mode 100644
index 348e75515..000000000
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockMemory.java
+++ /dev/null
@@ -1,258 +0,0 @@
-package com.earth2me.essentials.protect.data;

-

-import java.util.*;

-import java.util.Map.Entry;

-import org.bukkit.World;

-import org.bukkit.block.Block;

-import org.bukkit.plugin.Plugin;

-

-

-public class ProtectedBlockMemory implements IProtectedBlock

-{

-	private final List<String> worlds = new ArrayList<String>();

-	private final List<String> playerNames = new ArrayList<String>();

-	private final IProtectedBlock storage;

-	private final Plugin plugin;

-

-

-	static class ProtectedLocation

-	{

-		private final int x;

-		private final int y;

-		private final int z;

-		private final int w;

-

-		public ProtectedLocation(final Block block, final int worldId)

-		{

-			this.x = block.getX();

-			this.y = block.getY();

-			this.z = block.getZ();

-			this.w = worldId;

-		}

-

-		public ProtectedLocation(final OwnedBlock ownedBlock, final int worldId)

-		{

-			this.x = ownedBlock.x;

-			this.y = ownedBlock.y;

-			this.z = ownedBlock.z;

-			this.w = worldId;

-		}

-

-		@Override

-		public boolean equals(final Object object)

-		{

-			if (object instanceof ProtectedLocation)

-			{

-				final ProtectedLocation pLoc = (ProtectedLocation)object;

-				return x == pLoc.x && y == pLoc.y && z == pLoc.z && w == pLoc.w;

-			}

-			return false;

-		}

-

-		@Override

-		public int hashCode()

-		{

-			return x ^ y ^ z ^ w;

-		}

-	}

-

-

-	static class ProtectedBy

-	{

-		private int playerId = -1;

-		private Set<Integer> playerIds;

-

-		public void add(final int playerId)

-		{

-			if (this.playerId == -1 || this.playerId == playerId)

-			{

-				this.playerId = playerId;

-			}

-			else

-			{

-				if (playerIds == null)

-				{

-					playerIds = new HashSet<Integer>(4);

-					playerIds.add(this.playerId);

-				}

-				playerIds.add(playerId);

-			}

-		}

-

-		public boolean contains(final int playerId)

-		{

-			if (playerIds == null)

-			{

-				return this.playerId == playerId;

-			}

-			return playerIds.contains(playerId);

-		}

-

-		public List<String> getPlayers(final List<String> playerNames)

-		{

-			final List<String> list = new ArrayList<String>(2);

-			if (playerIds == null)

-			{

-				list.add(playerNames.get(playerId));

-			}

-			else

-			{

-				for (Integer integer : playerIds)

-				{

-					list.add(playerNames.get(integer));

-				}

-			}

-			return list;

-		}

-

-		public int size()

-		{

-			if (playerIds == null)

-			{

-				return 1;

-			}

-			return playerIds.size();

-		}

-	}

-	private final Map<ProtectedLocation, ProtectedBy> blocks = new HashMap<ProtectedLocation, ProtectedBy>();

-

-	public ProtectedBlockMemory(final IProtectedBlock storage, final Plugin plugin)

-	{

-		this.storage = storage;

-		this.plugin = plugin;

-		importProtections(storage.exportProtections());

-	}

-

-	@Override

-	public void clearProtections()

-	{

-		blocks.clear();

-	}

-

-	@Override

-	public final void importProtections(final List<OwnedBlock> blocks)

-	{

-		for (OwnedBlock ownedBlock : blocks)

-		{

-			final ProtectedLocation pl = new ProtectedLocation(ownedBlock, getWorldId(ownedBlock.world));

-			if (ownedBlock.playerName == null)

-			{

-				continue;

-			}

-			protectBlock(pl, ownedBlock.playerName);

-		}

-	}

-

-	@Override

-	public List<OwnedBlock> exportProtections()

-	{

-		final List<OwnedBlock> blockList = new ArrayList<OwnedBlock>(blocks.size());

-		for (Entry<ProtectedLocation, ProtectedBy> entry : blocks.entrySet())

-		{

-			for (String name : entry.getValue().getPlayers(playerNames))

-			{

-				final OwnedBlock ob = new OwnedBlock(

-						entry.getKey().x,

-						entry.getKey().y,

-						entry.getKey().z,

-						worlds.get(entry.getKey().w),

-						name);

-				blockList.add(ob);

-			}

-		}

-		return blockList;

-	}

-

-	@Override

-	public void protectBlock(final Block block, final String playerName)

-	{

-		final ProtectedLocation pl = new ProtectedLocation(block, getWorldId(block.getWorld()));

-		protectBlock(pl, playerName);

-		plugin.getServer().getScheduler().runTaskAsynchronously(plugin, new Runnable()

-		{

-			@Override

-			public void run()

-			{

-				storage.protectBlock(block, playerName);

-			}

-		});

-	}

-

-	private void protectBlock(ProtectedLocation pl, String playerName)

-	{

-		int playerId = getPlayerId(playerName);

-		ProtectedBy pb = blocks.get(pl);

-		if (pb == null)

-		{

-			pb = new ProtectedBy();

-			blocks.put(pl, pb);

-		}

-		pb.add(playerId);

-	}

-

-	@Override

-	public boolean isProtected(Block block, String playerName)

-	{

-		int playerId = getPlayerId(playerName);

-		ProtectedLocation pl = new ProtectedLocation(block, getWorldId(block.getWorld()));

-		ProtectedBy pb = blocks.get(pl);

-		return !pb.contains(playerId);

-	}

-

-	@Override

-	public List<String> getOwners(Block block)

-	{

-		ProtectedLocation pl = new ProtectedLocation(block, getWorldId(block.getWorld()));

-		ProtectedBy pb = blocks.get(pl);

-		return pb.getPlayers(playerNames);

-	}

-

-	@Override

-	public int unprotectBlock(final Block block)

-	{

-		ProtectedLocation pl = new ProtectedLocation(block, getWorldId(block.getWorld()));

-		ProtectedBy pb = blocks.remove(pl);

-		plugin.getServer().getScheduler().runTaskAsynchronously(plugin, new Runnable()

-		{

-			@Override

-			public void run()

-			{

-				storage.unprotectBlock(block);

-			}

-		});

-		return pb.size();

-	}

-

-	private int getPlayerId(String playername)

-	{

-		int id = playerNames.indexOf(playername);

-		if (id < 0)

-		{

-			playerNames.add(playername);

-			id = playerNames.indexOf(playername);

-		}

-		return id;

-	}

-

-	private int getWorldId(World world)

-	{

-		return getWorldId(world.getName());

-	}

-

-	private int getWorldId(String name)

-	{

-		int id = worlds.indexOf(name);

-		if (id < 0)

-		{

-			worlds.add(name);

-			id = worlds.indexOf(name);

-		}

-		return id;

-	}

-

-	@Override

-	public void onPluginDeactivation()

-	{

-		storage.onPluginDeactivation();

-	}

-}

diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockMySQL.java b/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockMySQL.java
deleted file mode 100644
index 2a0077698..000000000
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockMySQL.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package com.earth2me.essentials.protect.data;
-
-import java.beans.PropertyVetoException;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-
-public class ProtectedBlockMySQL extends ProtectedBlockJDBC
-{
-	public ProtectedBlockMySQL(String url, String username, String password) throws PropertyVetoException
-	{
-		super("com.mysql.jdbc.Driver", url, username, password);
-	}
-	private static final String QueryCreateTable =
-								"CREATE TABLE IF NOT EXISTS `EssentialsProtect` ("
-								+ "`worldName` varchar(60) NOT NULL,"
-								+ "`x` int(11) NOT NULL, `y` int(11) NOT NULL, `z` int(11) NOT NULL,"
-								+ "`playerName` varchar(150) DEFAULT NULL,"
-								+ "KEY `pos` (`worldName`,`x`,`z`,`y`)"
-								+ ") ENGINE=MyISAM DEFAULT CHARSET=utf8";
-
-	@Override
-	protected PreparedStatement getStatementCreateTable(Connection conn) throws SQLException
-	{
-		return conn.prepareStatement(QueryCreateTable);
-	}
-	private static final String QueryUpdateFrom2_0TableCheck =
-								"SHOW COLUMNS FROM `EssentialsProtect` LIKE 'id';";
-	private static final String QueryUpdateFrom2_0Table =
-								"ALTER TABLE `EssentialsProtect` "
-								+ "CHARACTER SET = utf8, ENGINE = MyISAM,"
-								+ "DROP COLUMN `id`,"
-								+ "CHANGE COLUMN `playerName` `playerName` VARCHAR(150) NULL AFTER `z`,"
-								+ "CHANGE COLUMN `worldName` `worldName` VARCHAR(60) NOT NULL,"
-								+ "ADD INDEX `position` (`worldName` ASC, `x` ASC, `z` ASC, `y` ASC),"
-								+ "DROP PRIMARY KEY ;";
-
-	@Override
-	protected PreparedStatement getStatementUpdateFrom2_0Table(Connection conn) throws SQLException
-	{
-		PreparedStatement testPS = null;
-		ResultSet testRS = null;
-		try
-		{
-			testPS = conn.prepareStatement(QueryUpdateFrom2_0TableCheck);
-			testRS = testPS.executeQuery();
-			if (testRS.first())
-			{
-				return conn.prepareStatement(QueryUpdateFrom2_0Table);
-			}
-			else
-			{
-				return conn.prepareStatement("SELECT 1;");
-			}
-		}
-		finally
-		{
-			if (testRS != null)
-			{
-				try
-				{
-					testRS.close();
-				}
-				catch (SQLException ex)
-				{
-					Logger.getLogger(ProtectedBlockMySQL.class.getName()).log(Level.SEVERE, null, ex);
-				}
-			}
-			if (testPS != null)
-			{
-				try
-				{
-					testPS.close();
-				}
-				catch (SQLException ex)
-				{
-					Logger.getLogger(ProtectedBlockMySQL.class.getName()).log(Level.SEVERE, null, ex);
-				}
-			}
-		}
-	}
-	private static final String QueryDeleteAll = "DELETE FROM EssentialsProtect;";
-
-	@Override
-	protected PreparedStatement getStatementDeleteAll(Connection conn) throws SQLException
-	{
-		return conn.prepareStatement(QueryDeleteAll);
-	}
-	private static final String QueryInsert =
-								"INSERT INTO EssentialsProtect (worldName, x, y, z, playerName) VALUES (?, ?, ?, ?, ?);";
-
-	@Override
-	protected PreparedStatement getStatementInsert(Connection conn, String world, int x, int y, int z, String playerName) throws SQLException
-	{
-		PreparedStatement ps = conn.prepareStatement(QueryInsert);
-		ps.setString(1, world);
-		ps.setInt(2, x);
-		ps.setInt(3, y);
-		ps.setInt(4, z);
-		ps.setString(5, playerName);
-		return ps;
-	}
-	private static final String QueryCountByPlayer =
-								"SELECT COUNT(playerName), SUM(playerName = ?) FROM EssentialsProtect "
-								+ "WHERE worldName = ? AND x = ? AND y = ? AND z = ? GROUP BY x;";
-
-	@Override
-	protected PreparedStatement getStatementPlayerCountByLocation(Connection conn, String world, int x, int y, int z, String playerName) throws SQLException
-	{
-		PreparedStatement ps = conn.prepareStatement(QueryCountByPlayer);
-		ps.setString(1, playerName);
-		ps.setString(2, world);
-		ps.setInt(3, x);
-		ps.setInt(4, y);
-		ps.setInt(5, z);
-		return ps;
-	}
-	private static final String QueryPlayersByLocation =
-								"SELECT playerName FROM EssentialsProtect WHERE worldname = ? AND x = ? AND y = ? AND z = ?;";
-
-	@Override
-	protected PreparedStatement getStatementPlayersByLocation(Connection conn, String world, int x, int y, int z) throws SQLException
-	{
-		PreparedStatement ps = conn.prepareStatement(QueryPlayersByLocation);
-		ps.setString(1, world);
-		ps.setInt(2, x);
-		ps.setInt(3, y);
-		ps.setInt(4, z);
-		return ps;
-	}
-	private static final String QueryDeleteByLocation =
-								"DELETE FROM EssentialsProtect WHERE worldName = ? AND x = ? AND y = ? AND z = ?;";
-
-	@Override
-	protected PreparedStatement getStatementDeleteByLocation(Connection conn, String world, int x, int y, int z) throws SQLException
-	{
-		PreparedStatement ps = conn.prepareStatement(QueryDeleteByLocation);
-		ps.setString(1, world);
-		ps.setInt(2, x);
-		ps.setInt(3, y);
-		ps.setInt(4, z);
-		return ps;
-	}
-	private static final String QueryAllBlocks =
-								"SELECT worldName, x, y, z, playerName FROM EssentialsProtect;";
-
-	@Override
-	protected PreparedStatement getStatementAllBlocks(Connection conn) throws SQLException
-	{
-		return conn.prepareStatement(QueryAllBlocks);
-	}
-}
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockSQLite.java b/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockSQLite.java
deleted file mode 100644
index cf256f1ec..000000000
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockSQLite.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.earth2me.essentials.protect.data;
-
-import java.beans.PropertyVetoException;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-
-public class ProtectedBlockSQLite extends ProtectedBlockJDBC
-{
-	public ProtectedBlockSQLite(String url) throws PropertyVetoException
-	{
-		super("org.sqlite.JDBC", url);
-	}
-	private static final String QueryCreateTable =
-								"CREATE TABLE IF NOT EXISTS EssentialsProtect ("
-								+ "worldName TEXT ,playerName TEXT, "
-								+ "x NUMERIC, y NUMERIC, z NUMERIC)";
-
-	@Override
-	protected PreparedStatement getStatementCreateTable(Connection conn) throws SQLException
-	{
-		return conn.prepareStatement(QueryCreateTable);
-	}
-	private static final String QueryUpdateFrom2_0Table =
-								"CREATE INDEX IF NOT EXISTS position ON EssentialsProtect ("
-								+ "worldName, x, z, y)";
-
-	@Override
-	protected PreparedStatement getStatementUpdateFrom2_0Table(Connection conn) throws SQLException
-	{
-		return conn.prepareStatement(QueryUpdateFrom2_0Table);
-	}
-	private static final String QueryDeleteAll = "DELETE FROM EssentialsProtect;";
-
-	@Override
-	protected PreparedStatement getStatementDeleteAll(Connection conn) throws SQLException
-	{
-		return conn.prepareStatement(QueryDeleteAll);
-	}
-	private static final String QueryInsert =
-								"INSERT INTO EssentialsProtect (worldName, x, y, z, playerName) VALUES (?, ?, ?, ?, ?);";
-
-	@Override
-	protected PreparedStatement getStatementInsert(Connection conn, String world, int x, int y, int z, String playerName) throws SQLException
-	{
-		PreparedStatement ps = conn.prepareStatement(QueryInsert);
-		ps.setString(1, world);
-		ps.setInt(2, x);
-		ps.setInt(3, y);
-		ps.setInt(4, z);
-		ps.setString(5, playerName);
-		return ps;
-	}
-	private static final String QueryPlayerCountByLocation =
-								"SELECT COUNT(playerName), SUM(playerName = ?) FROM EssentialsProtect "
-								+ "WHERE worldName = ? AND x = ? AND y = ? AND z = ? GROUP BY x;";
-
-	@Override
-	protected PreparedStatement getStatementPlayerCountByLocation(Connection conn, String world, int x, int y, int z, String playerName) throws SQLException
-	{
-		PreparedStatement ps = conn.prepareStatement(QueryPlayerCountByLocation);
-		ps.setString(1, playerName);
-		ps.setString(2, world);
-		ps.setInt(3, x);
-		ps.setInt(4, y);
-		ps.setInt(5, z);
-		return ps;
-	}
-	private static final String QueryPlayersByLocation =
-								"SELECT playerName FROM EssentialsProtect WHERE worldname = ? AND x = ? AND y = ? AND z = ?;";
-
-	@Override
-	protected PreparedStatement getStatementPlayersByLocation(Connection conn, String world, int x, int y, int z) throws SQLException
-	{
-		PreparedStatement ps = conn.prepareStatement(QueryPlayersByLocation);
-		ps.setString(1, world);
-		ps.setInt(2, x);
-		ps.setInt(3, y);
-		ps.setInt(4, z);
-		return ps;
-	}
-	private static final String QueryDeleteByLocation =
-								"DELETE FROM EssentialsProtect WHERE worldName = ? AND x = ? AND y = ? AND z = ?;";
-
-	@Override
-	protected PreparedStatement getStatementDeleteByLocation(Connection conn, String world, int x, int y, int z) throws SQLException
-	{
-		PreparedStatement ps = conn.prepareStatement(QueryDeleteByLocation);
-		ps.setString(1, world);
-		ps.setInt(2, x);
-		ps.setInt(3, y);
-		ps.setInt(4, z);
-		return ps;
-	}
-	private static final String QueryAllBlocks =
-								"SELECT worldName, x, y, z, playerName FROM EssentialsProtect;";
-
-	@Override
-	protected PreparedStatement getStatementAllBlocks(Connection conn) throws SQLException
-	{
-		return conn.prepareStatement(QueryAllBlocks);
-	}
-}