From 10e227a5ac734e00d0f5bbfa65f09e7d0c83982b Mon Sep 17 00:00:00 2001
From: TfT_02 <tft_02@hotmail.com>
Date: Sun, 3 Mar 2013 17:03:16 +0100
Subject: [PATCH] Fixed bug where Chimaera Wing would always teleport to spawn

---
 Changelog.txt                                          | 1 +
 src/main/java/com/gmail/nossr50/util/ChimaeraWing.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.txt b/Changelog.txt
index 4422da366..7d9a3a205 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -17,6 +17,7 @@ Version 1.4.01-dev
  = Fixed bug where the PTP cooldown was set improperly
  = Fixed bug where ptp permissions weren't being handled properly
  = Fixed bug where Beast Lore wouldn't work
+ = Fixed bug where Chimaera Wing would always teleport to spawn, even when the player had a valid bed spawn location
 
 Version 1.4.00
  + Added new Child Skill - Smelting!
diff --git a/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java b/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java
index 1a0c49dd0..f3b861466 100644
--- a/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java
+++ b/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java
@@ -44,7 +44,7 @@ public final class ChimaeraWing {
                     }
                 }
 
-                if (player.getBedSpawnLocation() != null && player.getBedSpawnLocation().getBlock().getType() == Material.BED_BLOCK) {
+                if (player.getBedSpawnLocation() != null) {
                     player.teleport(player.getBedSpawnLocation());
                 }
                 else {