Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

CraftBukkit-Patches/0057-Implement-respawn-API.patch

@@ -1,14 +1,14 @@
-From 5525c79dcc3eaf26c4b4785eca9bdc14ff6c38ad Mon Sep 17 00:00:00 2001
+From c6b2a59a9e9e424ab2e9a61ebbb2bd2779a29e23 Mon Sep 17 00:00:00 2001
 From: ninja- <xninja@openmailbox.org>
 Date: Tue, 8 Oct 2013 14:34:49 +0200
 Subject: [PATCH] Implement respawn API.
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 22fc18f..f8e43d1 100644
+index 2a13ab2..1b902b2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1272,6 +1272,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1270,6 +1270,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              getHandle().collidesWithEntities = collides;
              getHandle().l = collides; // First boolean of Entity
          }
@@ -25,5 +25,5 @@ index 22fc18f..f8e43d1 100644
  
      public Player.Spigot spigot()
 -- 
-1.8.3.2
+1.8.4.msysgit.0