minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-12 01:25:26 +02:00
Code Issues 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 7f0d17cb70
commit 3dd4d9d19e
2 changed files with 5 additions and 8 deletions
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)));