For border crossings where a safe location just inside the border can't be found, the player is now teleported to the spawn location for the current world instead of for the main world

This commit is contained in:
Brettflan 2012-01-31 10:32:26 -06:00
parent 9fcda08b3e
commit ffd003bf46
2 changed files with 3 additions and 3 deletions

View File

@ -27,13 +27,13 @@ dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath= endorsed.classpath=
excludes= excludes=
file.reference.CalcTest-src=src 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 file.reference.Permissions.jar=lib/Permissions.jar
includes=** includes=**
jar.compress=true jar.compress=true
javac.classpath=\ javac.classpath=\
${file.reference.Permissions.jar}:\ ${file.reference.Permissions.jar}:\
${file.reference.craftbukkit-1.0.0-SNAPSHOT.jar} ${file.reference.craftbukkit.jar}
# Space-separated list of extra javac options # Space-separated list of extra javac options
javac.compilerargs= javac.compilerargs=
javac.deprecation=false javac.deprecation=false

View File

@ -95,7 +95,7 @@ public class BorderCheckTask implements Runnable
{ {
if (Config.Debug()) if (Config.Debug())
Config.LogWarn("Target new location unviable, using spawn."); Config.LogWarn("Target new location unviable, using spawn.");
newLoc = player.getServer().getWorlds().get(0).getSpawnLocation(); newLoc = player.getWorld().getSpawnLocation();
} }
if (Config.Debug()) if (Config.Debug())