Merge branch 'master' into release

This commit is contained in:
KHobbits 2012-01-29 21:44:30 +00:00
commit d9e6f2975a

View file

@ -48,7 +48,7 @@ public class Commandhome extends EssentialsCommand
if ("bed".equalsIgnoreCase(homeName))
{
final Location bed = player.getBedSpawnLocation();
if (bed != null)
if (bed != null && bed.getBlock().getType() == Material.BED_BLOCK)
{
user.getTeleport().teleport(bed, charge, TeleportCause.COMMAND);
throw new NoChargeException();