spigot/CraftBukkit-Patches/0037-Implement-respawn-API.patch

30 lines
1,019 B
Diff
Raw Normal View History

2018-01-22 01:19:57 +11:00
From 6d833165c12439cfc5a47080b2688415fed437e7 Mon Sep 17 00:00:00 2001
2014-04-12 14:18:37 +10: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
2018-01-03 10:36:21 +11:00
index ec1740470..f16cdfa6b 100644
2014-04-12 14:18:37 +10:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2017-12-05 09:40:59 +11:00
@@ -1549,6 +1549,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2016-03-27 20:36:54 +11:00
public void setCollidesWithEntities(boolean collides) {
CraftPlayer.this.setCollidable(collides);
2014-04-12 14:18:37 +10:00
}
+
+ @Override
+ public void respawn()
+ {
+ if ( getHealth() <= 0 && isOnline() )
+ {
+ server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false );
+ }
+ }
};
public Player.Spigot spigot()
--
2017-11-17 10:24:35 +11:00
2.14.1
2014-04-12 14:18:37 +10:00