diff options
| author | KHobbits <rob@khobbits.co.uk> | 2011-09-09 14:23:42 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2011-09-09 14:23:42 +0100 |
| commit | 0b057d8e29a7f91e1ab27d99d9c9d4aaa53bdebf (patch) | |
| tree | a26a49cba1bde640d7a8058bc627532ffd6f36b2 | |
| parent | e8fbdef38b7ed8819146f7db33bafd1e4af34960 (diff) | |
| download | Essentials-0b057d8e29a7f91e1ab27d99d9c9d4aaa53bdebf.tar Essentials-0b057d8e29a7f91e1ab27d99d9c9d4aaa53bdebf.tar.gz Essentials-0b057d8e29a7f91e1ab27d99d9c9d4aaa53bdebf.tar.lz Essentials-0b057d8e29a7f91e1ab27d99d9c9d4aaa53bdebf.tar.xz Essentials-0b057d8e29a7f91e1ab27d99d9c9d4aaa53bdebf.zip | |
Move 'spawnifnospawn' check to home decision tree.
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/Teleport.java | 9 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandhome.java | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/com/earth2me/essentials/Teleport.java index 14574b83c..608663561 100644 --- a/Essentials/src/com/earth2me/essentials/Teleport.java +++ b/Essentials/src/com/earth2me/essentials/Teleport.java @@ -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); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java index fbcaa555d..2ee2661e6 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java @@ -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))); |