TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-15 05:33:40 +00:00
Code Issues Projects Releases Wiki Activity

Move 'spawnifnospawn' check to home decision tree.

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Essentials/src/com/earth2me/essentials/Teleport.java
View file

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

4
Essentials/src/com/earth2me/essentials/commands/Commandhome.java
View file

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