Move 'spawnifnospawn' check to home decision tree.

This commit is contained in:
KHobbits 2011-09-09 14:23:42 +01:00
parent e8fbdef38b
commit 0b057d8e29
2 changed files with 5 additions and 8 deletions

View File

@ -264,14 +264,7 @@ public class Teleport implements Runnable
final Location loc = user.getHome(home);
if (loc == null)
{
if (ess.getSettings().spawnIfNoHome())
{
respawn(ess.getSpawn(), chargeFor);
}
else
{
throw new NotEnoughArgumentsException();
}
throw new NotEnoughArgumentsException();
}
teleport(new Target(loc), chargeFor);
}

View File

@ -53,6 +53,10 @@ public class Commandhome extends EssentialsCommand
{
user.getTeleport().home(u, homes.get(0), charge);
}
else if (ess.getSettings().spawnIfNoHome())
{
user.getTeleport().respawn(ess.getSpawn(), charge);
}
else
{
user.sendMessage(Util.format("homes", Util.joinList(homes)));