Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

Bukkit-Patches/0018-Add-respawn-API.patch

@@ -1,14 +1,14 @@
-From 69c9fcf3b9cf8b0130d1deda78b36aaded807720 Mon Sep 17 00:00:00 2001
+From e97e54dbdcfe6c517061020a5fc377a2249fbd4e Mon Sep 17 00:00:00 2001
 From: ninja- <xninja@openmailbox.org>
 Date: Tue, 8 Oct 2013 14:35:58 +0200
 Subject: [PATCH] Add respawn API.
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 55681ff..5a8c13e 100644
+index b879ecb..6559243 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1059,6 +1059,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1076,6 +1076,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
@@ -24,5 +24,5 @@ index 55681ff..5a8c13e 100644
  
      Spigot spigot();
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0