summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-01-28 01:39:51 +0000
committerKHobbits <rob@khobbits.co.uk>2012-01-28 01:39:51 +0000
commit1214d93050f3a2f46b49ea9d24893376e4bc20de (patch)
tree19f8922096babd5581f12a4b0a429404a7bf6c3e
parentb53b75caa026105826cb127e25ad2db18c70739a (diff)
downloadEssentials-1214d93050f3a2f46b49ea9d24893376e4bc20de.tar
Essentials-1214d93050f3a2f46b49ea9d24893376e4bc20de.tar.gz
Essentials-1214d93050f3a2f46b49ea9d24893376e4bc20de.tar.lz
Essentials-1214d93050f3a2f46b49ea9d24893376e4bc20de.tar.xz
Essentials-1214d93050f3a2f46b49ea9d24893376e4bc20de.zip
Only list bed home if it is set.
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandhome.java13
1 files changed, 10 insertions, 3 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java
index 2bd09468e..ebe57adf7 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java
@@ -58,11 +58,15 @@ public class Commandhome extends EssentialsCommand
}
catch (NotEnoughArgumentsException e)
{
+ Location bed = player.getBedSpawnLocation();
+ if (bed != null && bed.getBlock().getType() != Material.BED_BLOCK)
+ {
+ bed = null;
+ }
final List<String> homes = player.getHomes();
if (homes.isEmpty() && player.equals(user))
{
- final Location bed = player.getBedSpawnLocation();
- if (bed != null && bed.getBlock().getType() == Material.BED_BLOCK)
+ if (bed != null)
{
user.getTeleport().teleport(bed, charge, TeleportCause.COMMAND);
throw new NoChargeException();
@@ -80,7 +84,10 @@ public class Commandhome extends EssentialsCommand
}
else
{
- homes.add("bed");
+ if (bed != null)
+ {
+ homes.add("bed");
+ }
user.sendMessage(_("homes", Util.joinList(homes)));
}
}