From b4b7cacf5eae52d9bd5aefd09ac60a20a316d2e7 Mon Sep 17 00:00:00 2001
From: feildmaster <admin@feildmaster.com>
Date: Tue, 29 Jan 2013 17:25:39 -0600
Subject: Fix NPE when getting bed spawn location.

---
 src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 6adc3cd0..b6c7b1ce 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -610,7 +610,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         World world = getServer().getWorld(getHandle().spawnWorld);
         ChunkCoordinates bed = getHandle().getBed();
 
-        if (world != null) {
+        if (world != null && bed != null) {
             bed = EntityHuman.getBed(((CraftWorld) world).getHandle(), bed, getHandle().isRespawnForced());
             if (bed != null) {
                 return new Location(world, bed.x, bed.y, bed.z);
-- 
cgit v1.2.3