maj/Metropolis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleaned up a bit and changed location of jars

Browse Source
This commit is contained in:
Tom Hicks
2012-02-14 11:21:01 -08:00
parent 2649240b0a
commit 915ad5377f
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Metropolis/.classpath
View File

@@ -2,8 +2,9 @@
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <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="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="lib/bukkit-1.1-R3.jar"/>
<classpathentry kind="lib" path="C:/Users/Tom/Desktop/MC Servers/City/plugins/WorldEdit.jar"/> <classpathentry kind="lib" path="lib/CommandBook.jar"/>
<classpathentry kind="lib" path="C:/Users/Tom/Desktop/MC Servers/City/plugins/WorldGuard.jar"/> <classpathentry kind="lib" path="lib/WorldEdit.jar"/>
<classpathentry kind="lib" path="lib/WorldGuard.jar"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

1
Metropolis/.gitignore vendored
View File

@@ -1,3 +1,4 @@
/server /server
/Plugin.jardesc /Plugin.jardesc
/Plugin-Release.jardesc /Plugin-Release.jardesc
/lib

11
Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/MetropolisPlugin.java
View File

@@ -4,11 +4,8 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.persistence.PersistenceException;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.configuration.Configuration; import org.bukkit.configuration.Configuration;
@@ -118,6 +115,7 @@ public class MetropolisPlugin extends JavaPlugin {
getCommand("metropolis-home-list").setExecutor(new MetropolisHomeListCommand(this)); getCommand("metropolis-home-list").setExecutor(new MetropolisHomeListCommand(this));
} }
/*
private void setupDatabase() { private void setupDatabase() {
try{ try{
getDatabase().find(PlayerHome.class).findRowCount(); getDatabase().find(PlayerHome.class).findRowCount();
@@ -126,6 +124,7 @@ public class MetropolisPlugin extends JavaPlugin {
installDDL(); installDDL();
} }
} }
/**/
private void fillOccupiedHomes() { private void fillOccupiedHomes() {
_occupiedHomes = new ArrayList<PlayerHome>(); _occupiedHomes = new ArrayList<PlayerHome>();
@@ -146,15 +145,15 @@ public class MetropolisPlugin extends JavaPlugin {
for(PlayerHome home : getDatabase().find(PlayerHome.class).findList()){ for(PlayerHome home : getDatabase().find(PlayerHome.class).findList()){
_occupiedHomes.add(home); _occupiedHomes.add(home);
} }
/**/
Map<String, ProtectedRegion> map = regionManager.getRegions(); Map<String, ProtectedRegion> map = regionManager.getRegions();
for(String regionId : map.keySet()){ 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())); log.info(String.format("Metropolis: %d occupied homes", _occupiedHomes.size()));
/**/
Collections.sort(_occupiedHomes); Collections.sort(_occupiedHomes);
} }
@@ -166,7 +165,7 @@ public class MetropolisPlugin extends JavaPlugin {
ProtectedRegion homeRegion = regionManager.getRegion(regionName); ProtectedRegion homeRegion = regionManager.getRegion(regionName);
log.info(homeRegion == null? "null" : homeRegion.toString()); //log.info(homeRegion == null? "null" : homeRegion.toString());
if(homeRegion == null){ if(homeRegion == null){
log.info(String.format("Creating home for player %s", player.getName())); log.info(String.format("Creating home for player %s", player.getName()));
home = generateHome(player.getName()); home = generateHome(player.getName());