summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-01-29 21:44:30 +0000
committerKHobbits <rob@khobbits.co.uk>2012-01-29 21:44:30 +0000
commitd9e6f2975ac750073e488f940ccac3bcc6bfbf26 (patch)
treea7b9421a335a6621d574d7f6bdd1258bfa7bed99
parentd8ac3587ac55a920547d2406853339116187ddc1 (diff)
parent2f1d9ad82cae64b1012f4f105e98b01bfc0db5ee (diff)
downloadEssentials-d9e6f2975ac750073e488f940ccac3bcc6bfbf26.tar
Essentials-d9e6f2975ac750073e488f940ccac3bcc6bfbf26.tar.gz
Essentials-d9e6f2975ac750073e488f940ccac3bcc6bfbf26.tar.lz
Essentials-d9e6f2975ac750073e488f940ccac3bcc6bfbf26.tar.xz
Essentials-d9e6f2975ac750073e488f940ccac3bcc6bfbf26.zip
Merge branch 'master' into releasestable-2.8.1
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandhome.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java
index ebe57adf7..f14422efd 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java
@@ -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();