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

30 lines
1.0 KiB
Diff
Raw Normal View History

2014-03-23 01:06:43 +01:00
From b79b05d49d9a71fc566f8d8de36b604395813867 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
2014-03-23 01:06:43 +01:00
index 962880b..d5903b7 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
2014-02-12 14:48:26 +01:00
@@ -1270,6 +1270,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2013-10-08 15:56:05 +02:00
getHandle().collidesWithEntities = collides;
2014-03-23 01:06:43 +01:00
getHandle().k = collides; // First boolean of Entity
2013-10-08 15:56:05 +02:00
}
+
+ @Override
+ public void respawn()
+ {
2014-01-31 08:15:33 +01:00
+ if ( getHealth() <= 0 && isOnline() )
2013-10-08 15:56:05 +02:00
+ {
+ server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false );
+ }
+ }
};
public Player.Spigot spigot()
--
2014-03-23 01:06:43 +01:00
1.8.5.2.msysgit.0
2013-10-09 09:22:37 +02:00