diff options
| author | KHobbits <rob@khobbits.co.uk> | 2013-02-01 02:59:40 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2013-02-01 02:59:40 +0000 |
| commit | cd8ee29ca6a866c3323d0b7584d8675d90e5e5d7 (patch) | |
| tree | 1437d8c7225c515fd79708bd7e9a46fc03ea43aa | |
| parent | 7b475e6ac79df3797013bbcd8c5fa6292292603d (diff) | |
| download | Essentials-cd8ee29ca6a866c3323d0b7584d8675d90e5e5d7.tar Essentials-cd8ee29ca6a866c3323d0b7584d8675d90e5e5d7.tar.gz Essentials-cd8ee29ca6a866c3323d0b7584d8675d90e5e5d7.tar.lz Essentials-cd8ee29ca6a866c3323d0b7584d8675d90e5e5d7.tar.xz Essentials-cd8ee29ca6a866c3323d0b7584d8675d90e5e5d7.zip | |
Let Bukkit decide if a bedspawn is valid or not.
Bukkit's bed fix forces minimum bukkit change.
4 files changed, 4 insertions, 4 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index 31480efb7..c06ff5ea9 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -69,7 +69,7 @@ import org.yaml.snakeyaml.error.YAMLException; public class Essentials extends JavaPlugin implements IEssentials { - public static final int BUKKIT_VERSION = 2586; + public static final int BUKKIT_VERSION = 2624; private static final Logger LOGGER = Logger.getLogger("Minecraft"); private transient ISettings settings; private final transient TNTExplodeListener tntListener = new TNTExplodeListener(this); diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/com/earth2me/essentials/Teleport.java index de063c8bf..71d659416 100644 --- a/Essentials/src/com/earth2me/essentials/Teleport.java +++ b/Essentials/src/com/earth2me/essentials/Teleport.java @@ -354,7 +354,7 @@ public class Teleport implements Runnable, ITeleport { final Player player = user.getBase(); Location bed = player.getBedSpawnLocation(); - if (bed != null && bed.getBlock().getType() == Material.BED_BLOCK) + if (bed != null) { now(new Target(bed), cause); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java index a5d355415..a73d0a6fc 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandhome.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandhome.java @@ -47,7 +47,7 @@ public class Commandhome extends EssentialsCommand if ("bed".equalsIgnoreCase(homeName) && user.isAuthorized("essentials.home.bed")) { 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(); diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java index a0d1ca643..391b6cf58 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java @@ -49,7 +49,7 @@ public class EssentialsSpawnPlayerListener implements Listener { Location home; final Location bed = user.getBedSpawnLocation(); - if (bed != null && bed.getBlock().getType() == Material.BED_BLOCK) + if (bed != null) { home = bed; } |