PaperSpigot-Parent/CraftBukkit-Patches/0074-Implement-respawn-API.patch

30 lines
1006 B
Diff
Raw Normal View History

2013-10-16 10:38:15 +02:00
From 6912aa737396aa58002642e475abb6f7daad090a Mon Sep 17 00:00:00 2001
2013-10-08 15:56:05 +02:00
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
2013-10-11 13:23:25 +02:00
index 33674b1..ed93040 100644
2013-10-08 15:56:05 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2013-10-09 09:22:37 +02:00
@@ -1135,6 +1135,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2013-10-08 15:56:05 +02:00
getHandle().collidesWithEntities = collides;
getHandle().m = collides; // First boolean of Entity
}
+
+ @Override
+ public void respawn()
+ {
2013-10-11 13:23:25 +02:00
+ if ( getHealth() <= 0 )
2013-10-08 15:56:05 +02:00
+ {
+ server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false );
+ }
+ }
};
public Player.Spigot spigot()
--
2013-10-09 09:22:37 +02:00
1.8.1.2