diff options
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandhome.java | 13 |
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))); } } |