diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-01-28 13:33:09 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-01-28 13:33:09 +0000 |
| commit | 047f3736314c48387b80c51bc993f20e7cfab32f (patch) | |
| tree | 4f3f4c964dbd6093234faeb3b46ff802c2d8cb85 /EssentialsSpawn | |
| parent | 72ed86e0dd030f24e67fe29ebb9eb471e206e0d0 (diff) | |
| parent | c6aa34076aeeab5e63ccee1102826fa9557753e9 (diff) | |
| download | Essentials-047f3736314c48387b80c51bc993f20e7cfab32f.tar Essentials-047f3736314c48387b80c51bc993f20e7cfab32f.tar.gz Essentials-047f3736314c48387b80c51bc993f20e7cfab32f.tar.lz Essentials-047f3736314c48387b80c51bc993f20e7cfab32f.tar.xz Essentials-047f3736314c48387b80c51bc993f20e7cfab32f.zip | |
Merge branch 'master' into 3.0
Conflicts:
Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java
Essentials/src/com/earth2me/essentials/commands/Commandhome.java
Essentials/src/com/earth2me/essentials/commands/Commandsethome.java
Essentials/src/messages_fr.properties
EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
Diffstat (limited to 'EssentialsSpawn')
| -rw-r--r-- | EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java index de58d86ed..248ac15b7 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java @@ -43,10 +43,15 @@ public class EssentialsSpawnPlayerListener implements Listener } if (respawnAtHome) { - Location home = user.getHome(user.getLocation()); - if (home == null) + Location home; + final Location bed = user.getBedSpawnLocation(); + if (bed != null && bed.getBlock().getType() == Material.BED_BLOCK) { - home = user.getBedSpawnLocation(); + home = bed; + } + else + { + home = user.getHome(user.getLocation()); } if (home != null) { |