diff options
| author | KHobbits <rob@khobbits.co.uk> | 2011-09-24 03:31:20 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2011-09-24 03:31:20 +0100 |
| commit | bd8fe521cd07d4fb60fd973fce30db4ec41463fc (patch) | |
| tree | c768eeeda028c826c7ee074573a7239b663403e1 | |
| parent | 59c93901d3a5d44275b7777cfd1f9b1f923206ba (diff) | |
| download | Essentials-bd8fe521cd07d4fb60fd973fce30db4ec41463fc.tar Essentials-bd8fe521cd07d4fb60fd973fce30db4ec41463fc.tar.gz Essentials-bd8fe521cd07d4fb60fd973fce30db4ec41463fc.tar.lz Essentials-bd8fe521cd07d4fb60fd973fce30db4ec41463fc.tar.xz Essentials-bd8fe521cd07d4fb60fd973fce30db4ec41463fc.zip | |
Adjusting behavior of 'spawn-if-no-home'.
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandhome.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java index 2ee2661e6..16b9fca2a 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java @@ -45,17 +45,17 @@ public class Commandhome extends EssentialsCommand catch (NotEnoughArgumentsException e) { List<String> homes = u.getHomes(); - if (homes.isEmpty()) + if (homes.isEmpty() && u.equals(user) && ess.getSettings().spawnIfNoHome()) { - throw new Exception(u == user ? Util.i18n("noHomeSet") : Util.i18n("noHomeSetPlayer")); + user.getTeleport().respawn(ess.getSpawn(), charge); } - else if ((homes.size() == 1) && u == user) + else if (homes.isEmpty()) { - user.getTeleport().home(u, homes.get(0), charge); + throw new Exception(u == user ? Util.i18n("noHomeSet") : Util.i18n("noHomeSetPlayer")); } - else if (ess.getSettings().spawnIfNoHome()) + else if (homes.size() == 1 && u.equals(user)) { - user.getTeleport().respawn(ess.getSpawn(), charge); + user.getTeleport().home(u, homes.get(0), charge); } else { |