From 915ad5377f181e429ddbbea2769fd1f923a18c5f Mon Sep 17 00:00:00 2001
From: headhunter45 <headhunter3@gmail.com>
Date: Tue, 14 Feb 2012 11:21:01 -0800
Subject: [PATCH] cleaned up a bit and changed location of jars

---
 Metropolis/.classpath                                 |  7 ++++---
 Metropolis/.gitignore                                 |  1 +
 .../bukkit/plugins/metropolis/MetropolisPlugin.java   | 11 +++++------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Metropolis/.classpath b/Metropolis/.classpath
index 07fbea5..89c113f 100644
--- a/Metropolis/.classpath
+++ b/Metropolis/.classpath
@@ -2,8 +2,9 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="lib" path="C:/Users/Tom/Desktop/mc-1.1/bukkit-1.1-R3.jar"/>
-	<classpathentry kind="lib" path="C:/Users/Tom/Desktop/MC Servers/City/plugins/WorldEdit.jar"/>
-	<classpathentry kind="lib" path="C:/Users/Tom/Desktop/MC Servers/City/plugins/WorldGuard.jar"/>
+	<classpathentry kind="lib" path="lib/bukkit-1.1-R3.jar"/>
+	<classpathentry kind="lib" path="lib/CommandBook.jar"/>
+	<classpathentry kind="lib" path="lib/WorldEdit.jar"/>
+	<classpathentry kind="lib" path="lib/WorldGuard.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/Metropolis/.gitignore b/Metropolis/.gitignore
index cf0bafa..9477b6b 100644
--- a/Metropolis/.gitignore
+++ b/Metropolis/.gitignore
@@ -1,3 +1,4 @@
 /server
 /Plugin.jardesc
 /Plugin-Release.jardesc
+/lib
diff --git a/Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/MetropolisPlugin.java b/Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/MetropolisPlugin.java
index b5d46de..7cd4035 100644
--- a/Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/MetropolisPlugin.java
+++ b/Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/MetropolisPlugin.java
@@ -4,11 +4,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.logging.Logger;
 
-import javax.persistence.PersistenceException;
-
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.configuration.Configuration;
@@ -118,6 +115,7 @@ public class MetropolisPlugin extends JavaPlugin {
 		getCommand("metropolis-home-list").setExecutor(new MetropolisHomeListCommand(this));
 	}
 	
+	/*
 	private void setupDatabase() {
 		try{
 			getDatabase().find(PlayerHome.class).findRowCount();
@@ -126,6 +124,7 @@ public class MetropolisPlugin extends JavaPlugin {
 			installDDL();
 		}
 	}
+	/**/
 	
 	private void fillOccupiedHomes() {
 		_occupiedHomes = new ArrayList<PlayerHome>();
@@ -146,15 +145,15 @@ public class MetropolisPlugin extends JavaPlugin {
 		for(PlayerHome home : getDatabase().find(PlayerHome.class).findList()){
 			_occupiedHomes.add(home);
 		}
-		/**/
 		
 		Map<String, ProtectedRegion> map = regionManager.getRegions();
 		for(String regionId : map.keySet()){
-			//log.info(String.format("key: %s, id: %s", regionId, map.get(regionId).getId()));
+			log.info(String.format("key: %s, id: %s", regionId, map.get(regionId).getId()));
 		}
 		
 		
 		log.info(String.format("Metropolis: %d occupied homes", _occupiedHomes.size()));
+		/**/
 		
 		Collections.sort(_occupiedHomes);
 	}
@@ -166,7 +165,7 @@ public class MetropolisPlugin extends JavaPlugin {
 		ProtectedRegion homeRegion = regionManager.getRegion(regionName);
 
 		
-		log.info(homeRegion == null? "null" : homeRegion.toString());
+		//log.info(homeRegion == null? "null" : homeRegion.toString());
 		if(homeRegion == null){
 			log.info(String.format("Creating home for player %s", player.getName()));
 			home = generateHome(player.getName());