From d302efeeb7a49aa7fc3b0bfc17b5f853abe391c3 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 11 Oct 2013 22:23:25 +1100 Subject: [PATCH] Fix entity dead check in respawn API --- CraftBukkit-Patches/0075-Implement-respawn-API.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CraftBukkit-Patches/0075-Implement-respawn-API.patch b/CraftBukkit-Patches/0075-Implement-respawn-API.patch index 3e28b8fd9..cc6996827 100644 --- a/CraftBukkit-Patches/0075-Implement-respawn-API.patch +++ b/CraftBukkit-Patches/0075-Implement-respawn-API.patch @@ -1,11 +1,11 @@ -From 555ab8ce507ae4a847914d9682608f40dbae92cc Mon Sep 17 00:00:00 2001 +From 2fafbcfb32166ba0814f976c91e48cf435047a7d Mon Sep 17 00:00:00 2001 From: ninja- 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 33674b1..2c607aa 100644 +index 33674b1..ed93040 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1135,6 +1135,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -16,7 +16,7 @@ index 33674b1..2c607aa 100644 + @Override + public void respawn() + { -+ if ( entity.dead ) ++ if ( getHealth() <= 0 ) + { + server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false ); + }