summaryrefslogtreecommitdiffstats
path: root/EssentialsSpawn
diff options
context:
space:
mode:
Diffstat (limited to 'EssentialsSpawn')
-rw-r--r--EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
index 7ec9ee043..4987f6ab1 100644
--- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
+++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
@@ -8,6 +8,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.bukkit.Bukkit;
import org.bukkit.Location;
+import org.bukkit.Material;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerRespawnEvent;
@@ -36,7 +37,12 @@ public class EssentialsSpawnPlayerListener implements Listener
Location home = user.getHome(user.getLocation());
if (home == null)
{
- home = user.getBedSpawnLocation();
+ final Location bed = user.getBedSpawnLocation();
+ if (bed.getBlock().getType() == Material.BED_BLOCK)
+ {
+ home = bed;
+ }
+
}
if (home != null)
{
@@ -90,7 +96,7 @@ public class EssentialsSpawnPlayerListener implements Listener
{
return;
}
-
+
try
{
Location spawn = spawns.getSpawn(ess.getSettings().getNewbieSpawn());