More upstream merge

By: md_5 <git@md-5.net>
2014-04-19 09:15:23 +10:00
parent 1752ff24d2
commit f8ca6ed867
136 changed files with 348 additions and 733 deletions
--- a/CraftBukkit-Patches/0053-Implement-respawn-API.patch
+++ b/CraftBukkit-Patches/0053-Implement-respawn-API.patch
@@ -0,0 +1,29 @@
+From 87430759742330ab89539a453b5d1a77afaa46b7 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 207ab87..a63db3b 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+@@ -1303,6 +1303,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+             getHandle().collidesWithEntities = collides;
+             getHandle().k = collides; // First boolean of Entity
+         }
+
+        @Override
+        public void respawn()
+        {
+            if ( getHealth() <= 0 && isOnline() )
+            {
+                server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false );
+            }
+        }
+     };
+ 
+     public Player.Spigot spigot()
+-- 
+1.9.1
+