diff --git a/nbproject/project.properties b/nbproject/project.properties
index 36ffa1d..0a04077 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -27,13 +27,13 @@ dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
 file.reference.CalcTest-src=src
-file.reference.craftbukkit-1.0.0-SNAPSHOT.jar=lib\\craftbukkit-1.0.0-SNAPSHOT.jar
+file.reference.craftbukkit.jar=lib\\craftbukkit.jar
 file.reference.Permissions.jar=lib/Permissions.jar
 includes=**
 jar.compress=true
 javac.classpath=\
     ${file.reference.Permissions.jar}:\
-    ${file.reference.craftbukkit-1.0.0-SNAPSHOT.jar}
+    ${file.reference.craftbukkit.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
diff --git a/src/com/wimbli/WorldBorder/BorderCheckTask.java b/src/com/wimbli/WorldBorder/BorderCheckTask.java
index 2d5985b..805ff3d 100644
--- a/src/com/wimbli/WorldBorder/BorderCheckTask.java
+++ b/src/com/wimbli/WorldBorder/BorderCheckTask.java
@@ -95,7 +95,7 @@ public class BorderCheckTask implements Runnable
 		{
 			if (Config.Debug())
 				Config.LogWarn("Target new location unviable, using spawn.");
-			newLoc = player.getServer().getWorlds().get(0).getSpawnLocation();
+			newLoc = player.getWorld().getSpawnLocation();
 		}
 
 		if (Config.Debug())